Author: baggins Date: Wed Mar 4 13:51:31 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 4
- Ockham's razor is your friend
- removed full_initrd bcond, just build static version with uClibc
---- Files affected:
SPECS:
busybox.spec (1.157 -> 1.158)
---- Diffs:
================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.157 SPECS/busybox.spec:1.158
--- SPECS/busybox.spec:1.157 Wed Mar 4 14:34:47 2009
+++ SPECS/busybox.spec Wed Mar 4 14:51:25 2009
@@ -23,9 +23,8 @@
#
%bcond_without static # don't build static version
%bcond_without initrd # don't build initrd version
-%bcond_with full_initrd # build full featured initrd version
-%bcond_with dietlibc # build dietlibc-based initrd version
-%bcond_with glibc # build glibc-based initrd version
+%bcond_with dietlibc # build dietlibc-based initrd and static
versions
+%bcond_with glibc # build glibc-based initrd and static versions
%bcond_with verbose
#
%ifnarch %{ix86} %{x8664} ppc
@@ -37,7 +36,7 @@
Name: busybox
# stable line only
Version: 1.12.4
-Release: 3
+Release: 4
License: GPL
Group: Applications
Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -58,8 +57,7 @@
BuildRequires: gcc >= 3.2
BuildRequires: perl-tools-pod
BuildRequires: rpmbuild(macros) >= 1.333
-%{?with_static:BuildRequires: glibc-static}
-%if %{with initrd}
+%if %{with initrd} || %{with static}
%if %{with dietlibc}
BuildRequires: dietlibc-static
%else
@@ -167,11 +165,7 @@
%build
install -d built
%if %{with initrd}
-%if %{with full_initrd}
-install %{SOURCE1} .config
-%else
install %{SOURCE2} .config
-%endif
%{__make} oldconfig
%{__make} \
%{?with_verbose:V=1} \
@@ -207,10 +201,23 @@
%{__make} oldconfig
%{__make} \
%{?with_verbose:V=1} \
- %{CrossOpts} \
- CFLAGS_EXTRA="%{rpmcflags}" \
+ CROSS_CFLAGS="%{rpmcflags} -Os -D_BSD_SOURCE" \
LDFLAGS="%{ld_rpmldflags} -static" \
+%if %{with dietlibc}
+ LIBRARIES="-lrpc" \
+ CC="diet gcc"
+%else
+%if %{with glibc}
+ %{CrossOpts} \
CC="%{__cc}"
+%else
+ %if "%{_target_base_arch}" != "%{_arch}"
+ CROSS="%{_target_cpu}-uclibc-" \
+ %endif
+ CC="%{_target_cpu}-uclibc-gcc"
+%endif
+%endif
+
mv -f busybox built/busybox.static
%{__make} clean
%endif
@@ -280,6 +287,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.158 2009/03/04 13:51:25 baggins
+- rel 4
+- Ockham's razor is your friend
+- removed full_initrd bcond, just build static version with uClibc
+
Revision 1.157 2009/03/04 13:34:47 baggins
- added full_initrd bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/busybox.spec?r1=1.157&r2=1.158&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
