diff --git a/srcpkgs/elfutils/patches/fix-system_h.patch b/srcpkgs/elfutils/patches/fix-system_h.patch deleted file mode 100644 index e996c29ee5d..00000000000 --- a/srcpkgs/elfutils/patches/fix-system_h.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/crc32_file.c.orig -+++ lib/crc32_file.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include "system.h" - - int - crc32_file (int fd, uint32_t *resp) ---- lib/system.h.orig -+++ lib/system.h -@@ -81,7 +81,7 @@ - do \ - __res = expression; \ - while (__res == -1 && errno == EINTR); \ -- __res; }); -+ __res; }) - #endif - - static inline ssize_t __attribute__ ((unused)) diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch index 1185ee94391..cbd68b16fe2 100644 --- a/srcpkgs/elfutils/patches/musl-macros.patch +++ b/srcpkgs/elfutils/patches/musl-macros.patch @@ -1,33 +1,3 @@ ---- libdw/libdw.h 2015-08-21 14:22:37.000000000 +0200 -+++ libdw/libdw.h 2015-11-20 08:31:14.160067056 +0100 -@@ -33,7 +33,27 @@ - #include - #include - #include -+#include -+#include -+#include - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ -+#ifndef strndupa -+#define strndupa(s, n) \ -+ (__extension__ ({const char *__in = (s); \ -+ size_t __len = strnlen (__in, (n)) + 1; \ -+ char *__out = (char *) alloca (__len); \ -+ __out[__len-1] = '\0'; \ -+ (char *) memcpy (__out, __in, __len-1);})) -+#endif - - #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) - # define __nonnull_attribute__(...) __attribute__ ((__nonnull__ (__VA_ARGS__))) --- src/arlib.h 2015-08-21 14:22:37.000000000 +0200 +++ src/arlib.h 2015-11-20 08:02:55.153199611 +0100 @@ -29,6 +29,16 @@ diff --git a/srcpkgs/elfutils/patches/musl-strndupa.patch b/srcpkgs/elfutils/patches/musl-strndupa.patch new file mode 100644 index 00000000000..f365fb019f2 --- /dev/null +++ b/srcpkgs/elfutils/patches/musl-strndupa.patch @@ -0,0 +1,18 @@ +--- src/unstrip.c.orig 2017-04-27 14:26:26.000000000 +0000 ++++ src/unstrip.c 2017-05-05 15:51:33.515154220 +0000 +@@ -56,6 +56,15 @@ + # define _(str) gettext (str) + #endif + ++#ifndef strndupa ++#define strndupa(s, n) \ ++ (__extension__ ({const char *__in = (s); \ ++ size_t __len = strnlen (__in, (n)) + 1; \ ++ char *__out = (char *) alloca (__len); \ ++ __out[__len-1] = '\0'; \ ++ (char *) memcpy (__out, __in, __len-1);})) ++#endif ++ + /* Name and version of program. */ + ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; + diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 987935a53f4..8aa7ef76c2c 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.168 +version=0.169 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276 +checksum=9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 # Suppress certain warnings to not fail for -Werror CFLAGS="-Wno-unused-result -Wno-format-nonliteral"