diff --git a/srcpkgs/elfutils/patches/musl-fts-obstack.patch b/srcpkgs/elfutils/patches/musl-fts-obstack.patch index 595ff3c3ef..4cc2e15282 100644 --- a/srcpkgs/elfutils/patches/musl-fts-obstack.patch +++ b/srcpkgs/elfutils/patches/musl-fts-obstack.patch @@ -63,20 +63,20 @@ dnl The directories with content. dnl Documentation. ---- libdw/Makefile.am 2015-10-07 03:39:16.000000000 +0200 -+++ libdw/Makefile.am 2015-11-20 08:18:04.225128686 +0100 +--- libdw/Makefile.am.orig 2016-04-02 12:20:57.174729538 +0200 ++++ libdw/Makefile.am 2016-04-02 12:23:05.422736154 +0200 @@ -112,7 +112,7 @@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ -- -ldl $(argp_LDADD) $(zip_LIBS) -+ -ldl $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) +- -ldl -lz $(argp_LDADD) $(zip_LIBS) ++ -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) @$(textrel_check) $(AM_V_at)ln -fs $@ $@.$(VERSION) ---- src/Makefile.am 2015-10-12 12:23:15.000000000 +0200 -+++ src/Makefile.am 2015-11-20 08:20:23.148117847 +0100 -@@ -104,27 +104,28 @@ +--- src/Makefile.am.orig 2016-04-02 12:20:57.175729538 +0200 ++++ src/Makefile.am 2016-04-02 12:26:24.247746411 +0200 +@@ -104,28 +104,28 @@ ar_no_Wstack_usage = yes unstrip_no_Wstack_usage = yes @@ -100,23 +100,23 @@ -findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) -addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib) -elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl --objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl ++elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl ++findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) ++addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib) ++elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl + objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl -ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) -strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) -ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) -unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl -stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl $(demanglelib) -+elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl -+findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -+addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib) -+elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl -+objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl +-elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) +ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) +strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) +ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) +unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl -+stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl \ -+ $(demanglelib) ++stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl $(demanglelib) ++elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) ldlex.o: ldscript.c ldlex_no_Werror = yes diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch index 5baaccbbd3..df3b8983da 100644 --- a/srcpkgs/elfutils/patches/musl-macros.patch +++ b/srcpkgs/elfutils/patches/musl-macros.patch @@ -69,3 +69,20 @@ /* State of -D/-U flags. */ extern bool arlib_deterministic_output; +--- src/elfcompress.c.orig 2016-04-02 12:51:26.903848894 +0200 ++++ src/elfcompress.c 2016-04-02 12:55:15.076996338 +0200 +@@ -35,6 +35,14 @@ + #include + #include "system.h" + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ALLPERMS) ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ ++#endif ++ + /* Name and version of program. */ + static void print_version (FILE *stream, struct argp_state *state); + ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index f5f98b49a3..36e0040247 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.164 +version=0.166 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://fedorahosted.org/elfutils/" distfiles="https://fedorahosted.org/releases/e/l/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" -checksum=9683c025928a12d06b7fe812928aa6235249e22d197d086f7084606a48165900 +checksum=3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 # Suppress certain warnings to not fail for -Werror CFLAGS="-Wno-unused-result -Wno-format-nonliteral"