commit ed59edba39fa61c2b6729bad7c66511fe3a7b679
Author: Jan Palus <[email protected]>
Date: Sat Nov 12 17:48:16 2022 +0100
use %{tirpcscflags} only if defined
busybox.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index 4756885..745b43a 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -217,7 +217,7 @@ echo 'CONFIG_EXTRA_LDLIBS="%{?with_glibc:%{tirpcslibs}}
%{?with_musl:%{tirpcslib
%{__make} oldconfig
%{__make} \
%{?with_verbose:V=1} \
- EXTRA_CFLAGS="%{rpmcflags} %{tirpcscflags} -Os -D_GNU_SOURCE
%{?with_musl:-I%{_includedir}/musl} %{!?with_glibc:-fno-stack-protector}" \
+ EXTRA_CFLAGS="%{rpmcflags} %{?tirpcscflags} -Os -D_GNU_SOURCE
%{?with_musl:-I%{_includedir}/musl} %{!?with_glibc:-fno-stack-protector}" \
EXTRA_LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack
%{?with_musl:-L%{_libdir}/musl}" \
%if %{with musl}
CC="musl-gcc"
@@ -251,7 +251,7 @@ sed -i -e 's|CONFIG_EXTRA_COMPAT=y|# CONFIG_EXTRA_COMPAT is
not set|g' .config
%{__make} oldconfig
%{__make} \
%{?with_verbose:V=1} \
- EXTRA_CFLAGS="%{rpmcflags} %{tirpcscflags} -Os -D_GNU_SOURCE
%{?with_musl:-I%{_includedir}/musl} %{!?with_glibc:-fno-stack-protector}" \
+ EXTRA_CFLAGS="%{rpmcflags} %{?tirpcscflags} -Os -D_GNU_SOURCE
%{?with_musl:-I%{_includedir}/musl} %{!?with_glibc:-fno-stack-protector}" \
EXTRA_LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack
%{?with_musl:-L%{_libdir}/musl}" \
%if %{with musl}
CC="musl-gcc"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/busybox.git/commitdiff/ed59edba39fa61c2b6729bad7c66511fe3a7b679
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
