mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-misc/rdfind: fix build w/ gcc 13, fix configure check
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
23
app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
Normal file
23
app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
https://github.com/pauldreik/rdfind/pull/115
|
||||
|
||||
From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 1 Sep 2022 13:13:50 -0700
|
||||
Subject: [PATCH] configure: Fix check for AC_CHECK_LIB
|
||||
|
||||
Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main()
|
||||
which is not in nettle library
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ERROR([
|
||||
On Debian-ish systems, use "apt-get install nettle-dev" to get a system
|
||||
wide nettle install.
|
||||
])])
|
||||
-AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
|
||||
+AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([
|
||||
Could not link to libnettle. Please install nettle
|
||||
first. If you have already done so; please run ldconfig
|
||||
as root or check whether the path libnettle was installed
|
||||
|
||||
35
app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
Normal file
35
app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
https://github.com/pauldreik/rdfind/pull/129
|
||||
|
||||
(drop limits bit as we already had a patch for that)
|
||||
|
||||
From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 25 Jan 2023 21:12:47 -0800
|
||||
Subject: [PATCH] include standard headers <limits> and <cstdint>
|
||||
|
||||
gcc 13 moved some includes around and as a result <cstdint> is no longer
|
||||
transitively included [1]. Explicitly include it for uint64_t.
|
||||
|
||||
Fixes errors like below
|
||||
|
||||
../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std'
|
||||
225 | o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max();
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
...
|
||||
|
||||
| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared
|
||||
|
||||
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/Fileinfo.hh
|
||||
+++ b/Fileinfo.hh
|
||||
@@ -8,6 +8,7 @@
|
||||
#define Fileinfo_hh
|
||||
|
||||
#include <array>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
// os specific headers
|
||||
37
app-misc/rdfind/rdfind-1.5.0-r1.ebuild
Normal file
37
app-misc/rdfind/rdfind-1.5.0-r1.ebuild
Normal file
@@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Find duplicate files based on their content"
|
||||
HOMEPAGE="https://github.com/pauldreik/rdfind"
|
||||
SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${PN}-releases-${PV}"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
RDEPEND="dev-libs/nettle:="
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="sys-devel/autoconf-archive"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.5.0_include-limits-header.patch"
|
||||
"${FILESDIR}/${PN}-1.5.0-configure-nettle.patch"
|
||||
"${FILESDIR}/${PN}-1.5.0-gcc-13.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Bug 840544
|
||||
local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}"
|
||||
addpredict /
|
||||
default
|
||||
}
|
||||
Reference in New Issue
Block a user