- add verbose flag; filter out -Wl,-z,-combreloc (caused linking to be done against...

Changed files:
    busybox.spec -> 1.148

diff --git a/busybox.spec b/busybox.spec
index 1b9f05867edb266d7e743bab7b33cf937a59f845..462d6d38c1db4ee85c0647c06e8f99ed4471a4cd 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -24,6 +24,7 @@
 %bcond_without initrd          # don't build initrd version
 %bcond_with    dietlibc        # build dietlibc-based initrd version
 %bcond_with    glibc           # build glibc-based initrd version
+%bcond_with    verbose
 #
 %ifnarch %{ix86} %{x8664} ppc
 %define with_glibc 1
@@ -87,6 +88,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
        %define CrossOpts %{nil}
 %endif
 
+%define                filterout_ld    -Wl,-z,-combreloc
+
 %description
 BusyBox combines tiny versions of many common UNIX utilities into a
 single small executable. It provides minimalist replacements for most
@@ -162,6 +165,7 @@ install -d built
 install %{SOURCE2} .config
 %{__make} oldconfig
 %{__make} \
+       %{?with_verbose:V=1} \
        CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
        LDFLAGS="%{ld_rpmldflags} -static" \
 %if %{with dietlibc}
@@ -193,6 +197,7 @@ install %{SOURCE1} .config
 %if %{with static}
 %{__make} oldconfig
 %{__make} \
+       %{?with_verbose:V=1} \
        %{CrossOpts} \
        CFLAGS_EXTRA="%{rpmcflags}" \
        LDFLAGS="%{ld_rpmldflags} -static" \
@@ -203,6 +208,7 @@ mv -f busybox built/busybox.static
 
 %{__make} oldconfig
 %{__make} \
+       %{?with_verbose:V=1} \
        %{CrossOpts} \
        CFLAGS_EXTRA="%{rpmcflags}" \
        LDFLAGS="%{ld_rpmldflags}" \