Author: sparky Date: Sun Dec 31 14:09:39 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %ld_rpmldflags
---- Files affected: SPECS: busybox.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: SPECS/busybox.spec diff -u SPECS/busybox.spec:1.121 SPECS/busybox.spec:1.122 --- SPECS/busybox.spec:1.121 Sat Dec 30 14:29:30 2006 +++ SPECS/busybox.spec Sun Dec 31 15:09:34 2006 @@ -58,6 +58,7 @@ URL: http://www.busybox.net/ BuildRequires: gcc >= 3.2 BuildRequires: perl-tools-pod +BuildRequires: rpmbuild(macros) >= 1.333 %{?with_static:BuildRequires: glibc-static} %if %{with initrd} %if %{with dietlibc} @@ -85,8 +86,6 @@ %define _bindir /bin %define _initrd_bindir /bin -# ld is used to link applets -%define filterout_ld -Wl,--as-needed %if "%{_target_base_arch}" != "%{_arch}" %define CrossOpts CROSS="%{_target_cpu}-pld-linux-" @@ -172,7 +171,7 @@ %{__make} oldconfig %{__make} \ CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \ - LDFLAGS="%{rpmldflags} -static" \ + LDFLAGS="%{ld_rpmldflags} -static" \ %if %{with dietlibc} LIBRARIES="-lrpc" \ CC="diet gcc" @@ -204,7 +203,7 @@ %{__make} \ %{CrossOpts} \ CFLAGS_EXTRA="%{rpmcflags}" \ - LDFLAGS="%{rpmldflags} -static" \ + LDFLAGS="%{ld_rpmldflags} -static" \ CC="%{__cc}" mv -f busybox built/busybox.static %{__make} clean @@ -214,7 +213,7 @@ %{__make} \ %{CrossOpts} \ CFLAGS_EXTRA="%{rpmcflags}" \ - LDFLAGS="%{rpmldflags}" \ + LDFLAGS="%{ld_rpmldflags}" \ CC="%{__cc}" %{__make} busybox.links docs/BusyBox.1 @@ -274,6 +273,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.122 2006/12/31 14:09:34 sparky +- use %ld_rpmldflags + Revision 1.121 2006/12/30 13:29:30 qboosh - updated to 1.3.1, updated configs - updated printf-gettext,loadfont,dhcp patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/busybox.spec?r1=1.121&r2=1.122&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
