diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-27 02:00:01 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-27 02:00:01 +0000 |
| commit | ead7697a01fd631b56240b2d58aedd98ba7f92d3 (patch) | |
| tree | c73ecbedbb9db967a7dff614f5e8b79eacb79f5d /dev-libs/libzia | |
| parent | 403335d7014372971e9e9267493a808d08bab48e (diff) | |
gentoo auto-resync : 27:11:2024 - 02:00:00
Diffstat (limited to 'dev-libs/libzia')
| -rw-r--r-- | dev-libs/libzia/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libzia/files/libzia-4.64-musl-strerror_r.patch | 14 | ||||
| -rw-r--r-- | dev-libs/libzia/libzia-4.64-r1.ebuild (renamed from dev-libs/libzia/libzia-4.64.ebuild) | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest index d1ccb912734d..49f9dda5280c 100644 --- a/dev-libs/libzia/Manifest +++ b/dev-libs/libzia/Manifest @@ -1,5 +1,6 @@ +AUX libzia-4.64-musl-strerror_r.patch 642 BLAKE2B b71edcb7676a8337a7793c6296f0d8155a66eea83b76bcd961171ece923824b9b24d30470047c66bc9b4f719b87e30a6c41f5cc29fc9003af7cf8e9643423aff SHA512 91c7aba0f5e40fad0e0392b026dd9f277b834f61853cf08948225e777caadec51c68746488cb90199e51dc332d75ec6cd7aa0f2d5318014573ca847e3a4ffa06 DIST libzia-4.61.tar.gz 649569 BLAKE2B 992f7d7a4f2a7497d490a32b04c2f67e45aef361d4f55bd24ab873b3a422f2bd2a23501c275d6771459b5ebe5d169fc28123a4fd328f0977a639fa92991ba62b SHA512 210104a16846b4bbae51e91cd88428cb8b6f487a6bc234a8a7351d03865ff968bf75d102dfe5657f9fc1c181e2071a4e4ab6be0e22da277188f3ab9752ea789d DIST libzia-4.64.tar.gz 655073 BLAKE2B 7ec3397565d441d7f820bda9b73e1051031e30bea6111e28cc2073cd1ea49be237c35c1eb358671b1930de74e0e2f3ff4beb476676ce9b9bef608a9f39da5ca3 SHA512 5e520fb1e1782e919c727e6056ae1e979c9774e9a994267c9eabe86f4a5b9c62d11639b59735e236cc36fa42e319418e4cbe12a2e41c47d5040ed6c1d7929192 EBUILD libzia-4.61.ebuild 1192 BLAKE2B ad0b154d8494e3b7415eaa8dc6f1d421196fd13da93b63edba012155fbf62470709c125e5c36524485045c20e1272edbe1efec5c7a4f5ff73aaa16b7f170b720 SHA512 12b3a534a7a60e96e347452cc74394a1aa31eb48bf0ed059fff036821c7acdd8cddead73165ae9b20384208867e92d2844bae6802b3e2daae07abf98b9449128 -EBUILD libzia-4.64.ebuild 1194 BLAKE2B dc2a684fbe620ca80e26d2b8ce85f7a4f9f67a55dd93c4deae51b39a9e7a19bee310f98b36473988771f08aa922a55d2dd2082956c0443c09fa13496f7577f9d SHA512 31190be0bccb1b5079d131d0c5af2653df3d0f6ee41c6c59f955dd116fc09d5b0ed143acf380f4dfce299e2953bd669a734265d087e45da4d994fa14e76ed17b +EBUILD libzia-4.64-r1.ebuild 1259 BLAKE2B 6a59570ce37460c1d5c0b7e4e30f0d5bfb574e4237f6dc91f911b4467b0398e60124d51341b1fa89caa0384767d9a2cdb79a548f094733b539a2e21742ff7166 SHA512 0b54d35057b649155e2ef4e55d2dc4d8cf4720dbf11bdd0bf358e66f6dcdd39794f8ba7757d7354188aae455ff4c82beefa5e8124867bfe4e7369c7cc4fa90f1 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f 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 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 } |