[packages/busybox] Strip double double-quote which was preventing all libs from CONFIG_EXTRA_LDLIBS from being used. Ad

[arekm]

commit b36f29571b2faccbdf91466d411ca9b26b187e6e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jun 15 11:03:06 2022 +0200

    Strip double double-quote which was preventing all libs from CONFIG_EXTRA_LDLIBS from being used. Add required static libs for tirpcslibs.

 busybox.spec       |  7 ++++++-
 strip-quotes.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/busybox.spec b/busybox.spec
index 179ee2c..99b49d7 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -62,6 +62,7 @@ Patch7:		%{name}-fix_64_archs.patch
 Patch8:		busybox-1.31.1-stime-fix.patch
 Patch9:		%{name}-ash-export-PATH.patch
 Patch10:	0001-modutils-check-ELF-header-before-calling-finit_module.patch
+Patch11:	strip-quotes.patch
 URL:		http://www.busybox.net/
 BuildRequires:	gcc >= 3.2
 BuildRequires:	perl-tools-pod
@@ -76,7 +77,10 @@ BuildRequires:	dietlibc-static
 	%else
 		%if %{with glibc}
 BuildRequires:	glibc-static
+BuildRequires:	libcom_err-static
 BuildRequires:	libtirpc-static
+BuildRequires:	openssl-static
+BuildRequires:	sqlite3-static
 		%else
 %if "%{_target_base_arch}" != "%{_host_base_arch}"
 BuildRequires:	cross%{_target_base_arch}-uClibc-static
@@ -111,7 +115,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %if %{with glibc}
 %define		tirpccflags	%(pkg-config --cflags libtirpc)
 %if %{with initrd} || %{with static}
-%define		tirpcslibs	%(pkg-config --libs --static libtirpc|sed s/-l//g)
+%define		tirpcslibs	%(pkg-config --libs --static libtirpc krb5 krb5-gssapi openssl sqlite3|sed 's/-l//g')
 %endif
 %if %{with dynamic}
 %define		tirpcdlibs	%(pkg-config --libs libtirpc|sed s/-l//g)
@@ -190,6 +194,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 install -d built
diff --git a/strip-quotes.patch b/strip-quotes.patch
new file mode 100644
index 0000000..6d45292
--- /dev/null
+++ b/strip-quotes.patch
@@ -0,0 +1,11 @@
+--- busybox-1.35.0/Makefile~	2022-06-15 10:08:14.000000000 +0200
++++ busybox-1.35.0/Makefile	2022-06-15 10:11:50.040293067 +0200
+@@ -612,7 +612,7 @@ quiet_cmd_busybox__ ?= LINK    $@
+       "$(core-y)" \
+       "$(libs-y)" \
+       "$(LDLIBS)" \
+-      "$(CONFIG_EXTRA_LDLIBS)" \
++      "$(strip $(subst ",,$(CONFIG_EXTRA_LDLIBS)))" \
+       && $(srctree)/scripts/generate_BUFSIZ.sh --post include/common_bufsiz.h
+ 
+ # Generate System.map
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/b36f29571b2faccbdf91466d411ca9b26b187e6e