commit: a1ed8b4629eb4667857a6ccceb71c688892cf16e Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Tue Nov 26 07:59:58 2024 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Tue Nov 26 08:01:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ed8b46
dev-libs/libzia: Fix detection of strerror_r return type Closes: https://bugs.gentoo.org/942789 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> dev-libs/libzia/files/libzia-4.64-musl-strerror_r.patch | 14 ++++++++++++++ .../libzia/{libzia-4.64.ebuild => libzia-4.64-r1.ebuild} | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dev-libs/libzia/files/libzia-4.64-musl-strerror_r.patch b/dev-libs/libzia/files/libzia-4.64-musl-strerror_r.patch new file mode 100644 index 000000000000..e0fa0a7c46f0 --- /dev/null +++ b/dev-libs/libzia/files/libzia-4.64-musl-strerror_r.patch @@ -0,0 +1,14 @@ +# fix detecxtion of return type of strerror_r (bug #942789) +diff --git a/configure.ac b/configure.ac +index 0f4efac..2f4526e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -511,7 +511,7 @@ fi + + OLDCFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Werror" +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <string.h> ]], [[ int i = strerror_r(1);]])],[ AC_DEFINE([Z_STRERROR_R_RETURNS_INT], [], [strerror_r returns int not char*])],[]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <string.h> ]], [[ int i = strerror_r(1, NULL, 1);]])],[ AC_DEFINE([STRERROR_R_RETURNS_INT], [], [strerror_r returns int not char*])],[]) + CFLAGS=$OLDCFLAGS + + diff --git a/dev-libs/libzia/libzia-4.64.ebuild b/dev-libs/libzia/libzia-4.64-r1.ebuild similarity index 91% rename from dev-libs/libzia/libzia-4.64.ebuild rename to dev-libs/libzia/libzia-4.64-r1.ebuild index 7bc214eded10..52dda13f3f52 100644 --- a/dev-libs/libzia/libzia-4.64.ebuild +++ b/dev-libs/libzia/libzia-4.64-r1.ebuild @@ -32,11 +32,13 @@ src_prepare() { sed -i -e "s/docsdir/#docsdir/g" \ -e "s/docs_/#docs_/g" Makefile.am || die - # fix build for MUSL (bugs #832235, 935544) + # fix build for MUSL (bugs #832235, 935544, 942789) if use elibc_musl ; then sed -i -e "s/zstr.h>/zstr.h>\\n#include <libunwind.h>/" src/zbfd.c || die sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die + eapply "${FILESDIR}/${PN}-4.64-musl-strerror_r.patch" fi + eautoreconf }
