commit 5a63550
hovercats
·
2024-05-04 17:33:56 +0000 UTC
parent db36c09
libelf: make patches more consistent
4 files changed,
+22,
-9
+1,
-1
1@@ -1,6 +1,6 @@
2 #!/bin/sh -e
3
4-patch -p1 < musl.patch
5+patch -p1 < 0001-fix-checks-for-argp_parse-and-fts_close.patch
6
7 # Build sometimes forces -Werror.
8 export CFLAGS="$CFLAGS -Wno-error"
+1,
-1
1@@ -1,2 +1,2 @@
2 e9e3f567ab63784d968f708c08ea5a09dd5fae2f0846d0d43a2ebc8b542c15b2d8
3-ca809d922b60ed548f7ce36bba97d6b0620d602a9bf31164022e1d805cfc83fb03
4+9a8f65322537a9c5c2f00b347a44de840e5f91e0e3f6b6c6d56b5ab4316385416c
R repo/libelf/patches/musl.patch =>
repo/libelf/patches/0001-fix-checks-for-argp_parse-and-fts_close.patch
+19,
-6
1@@ -1,8 +1,18 @@
2+From a3aa0f3a770724367d456cf747c7642344d97093 Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Sat, 4 May 2024 19:30:17 +0200
5+Subject: [PATCH] fix checks for argp_parse and fts_close
6+
7+---
8+ configure | 6 +++---
9+ lib/Makefile.in | 8 ++++----
10+ 2 files changed, 7 insertions(+), 7 deletions(-)
11+
12 diff --git a/configure b/configure
13-index 562d9f4..8c45cc1 100755
14+index 6eb5a43..b76362a 100755
15 --- a/configure
16 +++ b/configure
17-@@ -8880,7 +8880,7 @@ LIBS="$saved_LIBS"
18+@@ -9287,7 +9287,7 @@ LIBS="$saved_LIBS"
19 case "$ac_cv_search_argp_parse" in
20 no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
22@@ -11,7 +21,7 @@ index 562d9f4..8c45cc1 100755
23 See \`config.log' for more details" "$LINENO" 5; } ;;
24 -l*) argp_LDADD="$ac_cv_search_argp_parse" ;;
25 *) argp_LDADD= ;;
26-@@ -8951,7 +8951,7 @@ LIBS="$saved_LIBS"
27+@@ -9358,7 +9358,7 @@ LIBS="$saved_LIBS"
28 case "$ac_cv_search_fts_close" in
29 no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
30 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
31@@ -20,7 +30,7 @@ index 562d9f4..8c45cc1 100755
32 See \`config.log' for more details" "$LINENO" 5; } ;;
33 -l*) fts_LIBS="$ac_cv_search_fts_close" ;;
34 *) fts_LIBS= ;;
35-@@ -9022,7 +9022,7 @@ LIBS="$saved_LIBS"
36+@@ -9429,7 +9429,7 @@ LIBS="$saved_LIBS"
37 case "$ac_cv_search__obstack_free" in
38 no) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
39 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
40@@ -30,7 +40,7 @@ index 562d9f4..8c45cc1 100755
41 -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;;
42 *) obstack_LIBS= ;;
43 diff --git a/lib/Makefile.in b/lib/Makefile.in
44-index e84bc45..1f3be35 100644
45+index 140a5ee..1e96d7e 100644
46 --- a/lib/Makefile.in
47 +++ b/lib/Makefile.in
48 @@ -117,8 +117,8 @@ libeu_a_AR = $(AR) $(ARFLAGS)
49@@ -44,7 +54,7 @@ index e84bc45..1f3be35 100644
50 libeu_a_OBJECTS = $(am_libeu_a_OBJECTS)
51 AM_V_P = $(am__v_P_@AM_V@)
52 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
53-@@ -409,10 +409,10 @@ textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found);
54+@@ -417,10 +417,10 @@ textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found);
55 noinst_LIBRARIES = libeu.a
56 libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \
57 crc32.c crc32_file.c \
58@@ -57,3 +67,6 @@ index e84bc45..1f3be35 100644
59 atomics.h stdatomic-fbsd.h dynamicsizehash_concurrent.h
60
61 EXTRA_DIST = dynamicsizehash.c dynamicsizehash_concurrent.c
62+--
63+2.44.0
64+
+1,
-1
1@@ -1,2 +1,2 @@
2 https://sourceware.org/elfutils/ftp/0.191/elfutils-0.191.tar.bz2
3-patches/musl.patch
4+patches/0001-fix-checks-for-argp_parse-and-fts_close.patch