diff --git a/srcpkgs/elfutils/patches/musl-accessperms.patch b/srcpkgs/elfutils/patches/musl-accessperms.patch deleted file mode 100644 index 1e23018cb46..00000000000 --- a/srcpkgs/elfutils/patches/musl-accessperms.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/strip.c 2015-10-12 12:22:58.000000000 +0200 -+++ src/strip.c 2015-11-20 07:44:13.626287111 +0100 -@@ -44,6 +44,10 @@ - #include - #include - -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - typedef uint8_t GElf_Byte; - - /* Name and version of program. */ diff --git a/srcpkgs/elfutils/patches/musl-fts-obstack.patch b/srcpkgs/elfutils/patches/musl-fts-obstack.patch index 02a84f1c89b..6ef2d277092 100644 --- a/srcpkgs/elfutils/patches/musl-fts-obstack.patch +++ b/srcpkgs/elfutils/patches/musl-fts-obstack.patch @@ -63,17 +63,6 @@ dnl The directories with content. dnl Documentation. ---- 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 -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.orig 2016-08-29 21:38:11.179295769 +0200 +++ src/Makefile.am 2016-08-03 18:19:47.000000000 +0200 @@ -67,22 +67,22 @@ @@ -113,3 +102,14 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ +--- libdw/Makefile.am.orig 2017-08-05 01:41:04.103553705 +0000 ++++ libdw/Makefile.am 2017-08-05 01:43:55.366543497 +0000 +@@ -105,7 +105,7 @@ + libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ + ../libdwfl/libdwfl_pic.a ../libebl/libebl.a + libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so +-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) ++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) + libdw_so_SOURCES = + libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) + # The rpath is necessary for libebl because its $ORIGIN use will diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch index cbd68b16fe2..b4ae5e3c3da 100644 --- a/srcpkgs/elfutils/patches/musl-macros.patch +++ b/srcpkgs/elfutils/patches/musl-macros.patch @@ -34,3 +34,20 @@ /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; +--- src/strip.c.orig 2017-08-02 12:06:25.000000000 +0000 ++++ src/strip.c 2017-08-05 01:58:01.523493062 +0000 +@@ -47,6 +47,14 @@ + #include + #include + ++#if !defined(FNM_EXTMATCH) ++# define FNM_EXTMATCH 0 ++#endif ++ ++#if !defined(ACCESSPERMS) ++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) ++#endif ++ + typedef uint8_t GElf_Byte; + + /* Name and version of program. */ diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 8aa7ef76c2c..aa4907e7f57 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.169 +version=0.170 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=9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 +checksum=1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 # Suppress certain warnings to not fail for -Werror CFLAGS="-Wno-unused-result -Wno-format-nonliteral"