diff --git a/extra/libelf/build b/extra/libelf/build index e5a6c820..fff1f470 100755 --- a/extra/libelf/build +++ b/extra/libelf/build @@ -2,10 +2,7 @@ patch -p1 < musl.patch -# Build sometimes forces -Werror. -export CFLAGS="$CFLAGS -Wno-error" - -sh ./configure \ +./configure \ --prefix=/usr \ --disable-symbol-versioning \ --disable-debuginfod \ diff --git a/extra/libelf/checksums b/extra/libelf/checksums index ad0b6ea8..78075542 100644 --- a/extra/libelf/checksums +++ b/extra/libelf/checksums @@ -1,2 +1,2 @@ -e9e3f567ab63784d968f708c08ea5a09dd5fae2f0846d0d43a2ebc8b542c15b2d8 -ca809d922b60ed548f7ce36bba97d6b0620d602a9bf31164022e1d805cfc83fb03 +aa298382cc45039d2d832bc270249cda5d1e89c7864003488492b40d28f21ab068 +c6504ca876490bd6024f157aa37b96e448dda18f4de15aa66b7167e1f5963490fb diff --git a/extra/libelf/patches/musl.patch b/extra/libelf/patches/musl.patch index 10ee4d49..8ea61d23 100644 --- a/extra/libelf/patches/musl.patch +++ b/extra/libelf/patches/musl.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 562d9f4..8c45cc1 100755 +index 66ac6b3..4cbe652 100755 --- a/configure +++ b/configure -@@ -8880,7 +8880,7 @@ LIBS="$saved_LIBS" +@@ -9345,7 +9345,7 @@ LIBS="$saved_LIBS" case "$ac_cv_search_argp_parse" in no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -11,7 +11,7 @@ index 562d9f4..8c45cc1 100755 See \`config.log' for more details" "$LINENO" 5; } ;; -l*) argp_LDADD="$ac_cv_search_argp_parse" ;; *) argp_LDADD= ;; -@@ -8951,7 +8951,7 @@ LIBS="$saved_LIBS" +@@ -9416,7 +9416,7 @@ LIBS="$saved_LIBS" case "$ac_cv_search_fts_close" in no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20,7 +20,7 @@ index 562d9f4..8c45cc1 100755 See \`config.log' for more details" "$LINENO" 5; } ;; -l*) fts_LIBS="$ac_cv_search_fts_close" ;; *) fts_LIBS= ;; -@@ -9022,7 +9022,7 @@ LIBS="$saved_LIBS" +@@ -9487,7 +9487,7 @@ LIBS="$saved_LIBS" case "$ac_cv_search__obstack_free" in no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -30,30 +30,28 @@ index 562d9f4..8c45cc1 100755 -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; *) obstack_LIBS= ;; diff --git a/lib/Makefile.in b/lib/Makefile.in -index e84bc45..1f3be35 100644 +index c559642..608013f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in -@@ -117,8 +117,8 @@ libeu_a_AR = $(AR) $(ARFLAGS) - libeu_a_LIBADD = +@@ -118,7 +118,7 @@ libeu_a_LIBADD = am_libeu_a_OBJECTS = xasprintf.$(OBJEXT) xstrdup.$(OBJEXT) \ xstrndup.$(OBJEXT) xmalloc.$(OBJEXT) next_prime.$(OBJEXT) \ -- crc32.$(OBJEXT) crc32_file.$(OBJEXT) color.$(OBJEXT) \ -- error.$(OBJEXT) printversion.$(OBJEXT) -+ crc32.$(OBJEXT) crc32_file.$(OBJEXT) \ + crc32.$(OBJEXT) crc32_file.$(OBJEXT) eu-search.$(OBJEXT) \ +- color.$(OBJEXT) error.$(OBJEXT) printversion.$(OBJEXT) + error.$(OBJEXT) libeu_a_OBJECTS = $(am_libeu_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -@@ -409,10 +409,10 @@ textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); +@@ -424,10 +424,10 @@ textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); noinst_LIBRARIES = libeu.a libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \ - crc32.c crc32_file.c \ + crc32.c crc32_file.c eu-search.c \ - color.c error.c printversion.c -+ color.c ++ error.c noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \ - eu-config.h color.h printversion.h bpf.h \ + eu-config.h bpf.h \ - atomics.h stdatomic-fbsd.h dynamicsizehash_concurrent.h + atomics.h stdatomic-fbsd.h dynamicsizehash_concurrent.h \ + eu-search.h locks.h - EXTRA_DIST = dynamicsizehash.c dynamicsizehash_concurrent.c diff --git a/extra/libelf/sources b/extra/libelf/sources index 97a3e694..9c3a43bf 100644 --- a/extra/libelf/sources +++ b/extra/libelf/sources @@ -1,2 +1,2 @@ -https://sourceware.org/elfutils/ftp/0.191/elfutils-0.191.tar.bz2 +https://sourceware.org/elfutils/ftp/0.192/elfutils-0.192.tar.bz2 patches/musl.patch diff --git a/extra/libelf/version b/extra/libelf/version index 86988463..ec7be459 100644 --- a/extra/libelf/version +++ b/extra/libelf/version @@ -1 +1 @@ -0.191 1 +0.192 1