[packages/busybox] fix passing flags

atler atler at pld-linux.org
Mon Dec 7 01:21:10 CET 2020


commit fb8bb2b87eacf7da1103635a82d47b0a8279575c
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Dec 6 22:08:30 2020 +0000

    fix passing flags

 busybox.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/busybox.spec b/busybox.spec
index 928f4b5..f5275b2 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -178,8 +178,8 @@ install %{SOURCE2} .config
 %{__make} oldconfig
 %{__make} \
 	%{?with_verbose:V=1} \
-	CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-	LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
+	EXTRA_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
+	EXTRA_LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
 	CC="diet %{__cc}"
@@ -209,8 +209,8 @@ install %{SOURCE1} .config
 %{__make} oldconfig
 %{__make} \
 	%{?with_verbose:V=1} \
-	CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
-	LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
+	EXTRA_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
+	EXTRA_LDFLAGS="%{rpmldflags} -static -Wl,-z,noexecstack" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
 	CC="diet %{__cc}"
@@ -235,8 +235,8 @@ mv -f busybox built/busybox.static
 %{__make} \
 	%{?with_verbose:V=1} \
 	%{CrossOpts} \
-	CFLAGS_EXTRA="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags} -Wl,-z,noexecstack" \
+	EXTRA_CFLAGS="%{rpmcflags}" \
+	EXTRA_LDFLAGS="%{rpmldflags} -Wl,-z,noexecstack" \
 	CC="%{__cc}"
 %{__make} busybox.links docs/busybox.1
 %endif
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list