commit:     2dff586ec1e93dae97dd97cfa2e310edbd633515
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 16:13:09 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 16:13:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dff586e

sys-fs/dd-rescue: Add nonstandard workaround for musl-1.2.4

See comments in the ebuild...

Bug: https://bugs.gentoo.org/920159
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild 
b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
index 614d8b106522..0f51c3d5bd9d 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,6 +53,12 @@ src_prepare() {
 }
 
 src_configure() {
+       # configure tests for the existence of fallocate64; if it can't find
+       # it it replaces it with a wrapper incompatible with musl... /o\
+       # we force it to assume its existence and then tell everyone to
+       # supply the *64 interface... bug 920159
+       # this workaround will stop working around once musl drops the *64 
functions.
+
        use static && append-ldflags -static
        # OpenSSL is only used by a random helper tool we don't install.
        ac_cv_header_attr_xattr_h=$(usex xattr) \
@@ -60,6 +66,7 @@ src_configure() {
        ac_cv_lib_crypto_EVP_aes_192_ctr=no \
        ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
        ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
+       ac_cv_func_fallocate64=yes \
        econf
 }
 
@@ -80,7 +87,7 @@ _emake() {
                OS="${os}" \
                HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
                HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-               RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+               RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS} -D_LARGEFILE64_SOURCE" \
                CFLAGS_OPT='$(CFLAGS)' \
                LDFLAGS="${LDFLAGS} 
-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
                CC="$(tc-getCC)" \

Reply via email to