SPECS: ash.spec, busybox.spec, cryptsetup-luks.spec, dmraid.spec, e2fsprogs...

baggins baggins at pld-linux.org
Mon Mar 23 15:11:00 CET 2009


Author: baggins                      Date: Mon Mar 23 14:11:00 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify dietlibc compile options and calls

---- Files affected:
SPECS:
   ash.spec (1.75 -> 1.76) , busybox.spec (1.163 -> 1.164) , cryptsetup-luks.spec (1.42 -> 1.43) , dmraid.spec (1.47 -> 1.48) , e2fsprogs.spec (1.205 -> 1.206) , libgcrypt.spec (1.67 -> 1.68) , lua50.spec (1.32 -> 1.33) , lua51.spec (1.11 -> 1.12) , lvm2.spec (1.133 -> 1.134) , mdadm.spec (1.87 -> 1.88) , module-init-tools.spec (1.72 -> 1.73) , popt.spec (1.98 -> 1.99) , setup.spec (1.151 -> 1.152) , udev.spec (1.289 -> 1.290) , xfsprogs.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/ash.spec
diff -u SPECS/ash.spec:1.75 SPECS/ash.spec:1.76
--- SPECS/ash.spec:1.75	Wed Feb 14 02:07:23 2007
+++ SPECS/ash.spec	Mon Mar 23 15:10:51 2009
@@ -179,14 +179,27 @@
 %patch22 -p1
 
 %build
+%if %{with static}
+%{__make} \
+%if %{with dietlibc}
+	CC="diet %{__cc}" \
+%else
+%if %{with uClibc}
+	CC="%{_target_cpu}-uclibc-gcc"\
+%else
+	CC="%{__cc}"
+%endif
+%endif
+	OPT_FLAGS="%{rpmcflags} -Os" \
+	LDFLAGS="-static %{rpmldflags}"
 
-%define __cc %{_target_cpu}-pld-linux-gcc
-%{?with_dietlibc:%define __cc %{_target_cpu}-dietlibc-gcc}
-%{?with_uClibc:%define __cc %{_target_cpu}-uclibc-gcc}
-
-%{?with_static:%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="-static %{rpmldflags}" CC="%{__cc}"}
-%{?with_static:mv -f sh ash.static}
-%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}"
+mv -f sh ash.static
+%endif
+
+%{__make} \
+	CC="%{__cc}" \
+	OPT_FLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -277,6 +290,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.75  2007/02/14 01:07:23  qrczak
 - ash-extern.patch: a variable can't be both extern and static
 - Release 11

================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.163 SPECS/busybox.spec:1.164
--- SPECS/busybox.spec:1.163	Mon Mar 23 14:03:13 2009
+++ SPECS/busybox.spec	Mon Mar 23 15:10:51 2009
@@ -170,7 +170,7 @@
 	LDFLAGS="%{ld_rpmldflags} -static" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
-	CC="diet gcc"
+	CC="diet %{__cc}"
 %else
 %if %{with glibc}
 	%{CrossOpts} \
@@ -202,7 +202,7 @@
 	LDFLAGS="%{ld_rpmldflags} -static" \
 %if %{with dietlibc}
 	LIBRARIES="-lrpc" \
-	CC="diet gcc"
+	CC="diet %{__cc}"
 %else
 %if %{with glibc}
 	%{CrossOpts} \
@@ -287,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.163  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/cryptsetup-luks.spec
diff -u SPECS/cryptsetup-luks.spec:1.42 SPECS/cryptsetup-luks.spec:1.43
--- SPECS/cryptsetup-luks.spec:1.42	Mon Mar 23 14:03:13 2009
+++ SPECS/cryptsetup-luks.spec	Mon Mar 23 15:10:51 2009
@@ -153,7 +153,7 @@
 %if %{with initrd}
 %configure \
 %if %{with dietlibc}
-	CC="diet %{__cc} -Os %{rpmldflags}" \
+	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os" \
 	ac_cv_lib_popt_poptConfigFileToString=yes \
 	ac_cv_lib_sepol_sepol_bool_set=no \
 	ac_cv_lib_selinux_is_selinux_enabled=no \
@@ -169,8 +169,9 @@
 %if %{with dietlibc}
 # we have to do it by hand cause libtool "know better" and forces
 # static libs from /usr/lib
-diet %{__cc} -Os -I./lib -static -o cryptsetup-initrd src/cryptsetup.c \
-	./lib/.libs/libcryptsetup.a -lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
+diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -I./lib -static \
+	-o cryptsetup-initrd src/cryptsetup.c ./lib/.libs/libcryptsetup.a \
+	-lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
 %else
 %{__make} -C src
 mv src/cryptsetup cryptsetup-initrd
@@ -251,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.42  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.47 SPECS/dmraid.spec:1.48
--- SPECS/dmraid.spec:1.47	Mon Mar 23 14:03:13 2009
+++ SPECS/dmraid.spec	Mon Mar 23 15:10:51 2009
@@ -131,7 +131,7 @@
 %if %{with initrd}
 %configure \
 	%if %{with dietlibc}
-	CC="diet %{__cc} -Os %{rpmldflags} -static" \
+	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static" \
 	--disable-libselinux \
 	--disable-libsepol \
 	%else
@@ -212,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.47  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.205 SPECS/e2fsprogs.spec:1.206
--- SPECS/e2fsprogs.spec:1.205	Mon Mar 23 14:03:13 2009
+++ SPECS/e2fsprogs.spec	Mon Mar 23 15:10:51 2009
@@ -654,8 +654,8 @@
 	ac_cv_lib_dl_dlopen=no \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
 	%{?with_dietlibc:--with-cc="diet %{__cc}"} \
-	--with-ccopts="-Os" \
-	--with-ldopts="-static" \
+	--with-ccopts="%{rpmcflags} -Os" \
+	--with-ldopts="%{rpmldflags} -static" \
 	--disable-elf-shlibs \
 	--disable-selinux \
 	--disable-nls \
@@ -1092,6 +1092,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.205  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/libgcrypt.spec
diff -u SPECS/libgcrypt.spec:1.67 SPECS/libgcrypt.spec:1.68
--- SPECS/libgcrypt.spec:1.67	Wed Mar 18 17:46:20 2009
+++ SPECS/libgcrypt.spec	Mon Mar 23 15:10:51 2009
@@ -118,7 +118,7 @@
 
 %if %{with dietlibc}
 %configure \
-	CC="diet %{__cc} -Os %{rpmldflags}" \
+	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os" \
 	--enable-static \
 	--disable-shared
 
@@ -196,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.67  2009/03/18 16:46:20  baggins
 - rel 2
 - removed static_libs bcond

================================================================
Index: SPECS/lua50.spec
diff -u SPECS/lua50.spec:1.32 SPECS/lua50.spec:1.33
--- SPECS/lua50.spec:1.32	Mon Jul 28 00:25:01 2008
+++ SPECS/lua50.spec	Mon Mar 23 15:10:51 2009
@@ -18,7 +18,7 @@
 Patch0:		lua5-link.patch
 Patch1:		%{name}-Makefile.patch
 URL:		http://www.lua.org/
-%{?with_luastatic:BuildRequires:       dietlibc-devel}
+%{?with_luastatic:BuildRequires:       dietlibc-static}
 Requires:	%{name}-libs = %{version}-%{release}
 Provides:	lua = %{version}
 Obsoletes:	lua < 4.0.1
@@ -107,8 +107,8 @@
 %build
 %if %{with luastatic}
 %{__make} all sobin \
-	CC="%{_target_cpu}-dietlibc-gcc" \
-	MYCFLAGS="%{rpmcflags} -fPIC" \
+	CC="diet %{__cc}" \
+	MYCFLAGS="%{rpmcflags} -fPIC -Os" \
 	EXTRA_DEFS="-DPIC -D_GNU_SOURCE"
 mv bin bin.static
 %{__make} clean
@@ -204,6 +204,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.32  2008/07/27 22:25:01  arekm
 - release 3
 

================================================================
Index: SPECS/lua51.spec
diff -u SPECS/lua51.spec:1.11 SPECS/lua51.spec:1.12
--- SPECS/lua51.spec:1.11	Mon Feb 23 23:06:46 2009
+++ SPECS/lua51.spec	Mon Mar 23 15:10:51 2009
@@ -14,7 +14,7 @@
 # Source0-md5:	d0870f2de55d59c1c8419f36e8fac150
 Patch0:		%{name}-link.patch
 URL:		http://www.lua.org/
-%{?with_luastatic:BuildRequires:       dietlibc-devel}
+%{?with_luastatic:BuildRequires:       dietlibc-static}
 BuildRequires:	readline-devel
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
@@ -106,8 +106,8 @@
 %if %{with luastatic}
 %{__make} all \
 	PLAT=posix \
-	CC="%{_target_cpu}-dietlibc-gcc" \
-	CFLAGS="%{rpmcflags} -Wall -fPIC -DPIC -D_GNU_SOURCE -DLUA_USE_POSIX"
+	CC="diet %{__cc}" \
+	CFLAGS="%{rpmcflags} -Wall -fPIC -Os -DPIC -D_GNU_SOURCE -DLUA_USE_POSIX"
 mv src/lua lua.static
 mv src/luac luac.static
 %{__make} clean
@@ -207,6 +207,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.11  2009/02/23 22:06:46  arekm
 - release 2
 

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.133 SPECS/lvm2.spec:1.134
--- SPECS/lvm2.spec:1.133	Mon Mar 23 14:03:13 2009
+++ SPECS/lvm2.spec	Mon Mar 23 15:10:51 2009
@@ -219,7 +219,7 @@
 	%{?with_dietlibc:CC="diet %{__cc}"} \
 	ac_cv_lib_dl_dlopen=no \
 	%{?debug:--enable-debug} \
-	--with-optimisation="-Os" \
+	--with-optimisation="%{rpmcflags} -Os" \
 	--enable-static_link \
 	--with-lvm1=internal \
 	--%{?with_glibc:en}%{!?with_glibc:dis}able-selinux \
@@ -356,6 +356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.133  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/mdadm.spec
diff -u SPECS/mdadm.spec:1.87 SPECS/mdadm.spec:1.88
--- SPECS/mdadm.spec:1.87	Mon Mar 23 14:03:13 2009
+++ SPECS/mdadm.spec	Mon Mar 23 15:10:51 2009
@@ -87,13 +87,13 @@
 %if %{with initrd}
 %if %{with dietlibc}
 %{__make} mdadm \
-	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static" \
+	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static" \
 	CWFLAGS="-Wall"
 mv -f mdadm initrd-mdadm
 %{__make} clean
-diet %{__cc}  -DUCLIBC -DMDASSEMBLE_AUTO -DMDASSEMBLE %{rpmcflags} %{rpmldflags} \
+diet %{__cc} -DUCLIBC -DMDASSEMBLE_AUTO -DMDASSEMBLE %{rpmcflags} %{rpmldflags} -Os \
 	-DHAVE_STDINT_H -o sha1.o -c sha1.c
-diet %{__cc} -DUCLIBC -DMDASSEMBLE_AUTO -DMDASSEMBLE %{rpmcflags} %{rpmldflags} -static \
+diet %{__cc} -DUCLIBC -DMDASSEMBLE_AUTO -DMDASSEMBLE %{rpmcflags} %{rpmldflags} -Os -static \
 	-o initrd-mdassemble mdassemble.c Assemble.c Manage.c config.c dlink.c \
 	mdopen.c mdstat.c util.c sysfs.c super0.c super1.c sha1.o
 %else
@@ -190,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.87  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/module-init-tools.spec
diff -u SPECS/module-init-tools.spec:1.72 SPECS/module-init-tools.spec:1.73
--- SPECS/module-init-tools.spec:1.72	Mon Mar 23 14:03:13 2009
+++ SPECS/module-init-tools.spec	Mon Mar 23 15:10:51 2009
@@ -83,7 +83,7 @@
 
 %if %{with initrd}
 %configure \
-	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static"} \
+	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static"} \
 	%{!?with_dietlibc:CC="%{__cc} -static"} \
 	--enable-zlib
 
@@ -159,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.72  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/popt.spec
diff -u SPECS/popt.spec:1.98 SPECS/popt.spec:1.99
--- SPECS/popt.spec:1.98	Wed Mar 18 17:19:14 2009
+++ SPECS/popt.spec	Mon Mar 23 15:10:51 2009
@@ -170,7 +170,7 @@
 
 %if %{with dietlibc}
 %configure \
-	CC="diet %{__cc} -Os -static" \
+	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static" \
 	ac_cv_func_stpcpy=yes \
 	--enable-static \
 	--disable-shared
@@ -235,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.98  2009/03/18 16:19:14  baggins
 - rel 2
 - removed static_libs bcond

================================================================
Index: SPECS/setup.spec
diff -u SPECS/setup.spec:1.151 SPECS/setup.spec:1.152
--- SPECS/setup.spec:1.151	Mon Mar  2 12:00:47 2009
+++ SPECS/setup.spec	Mon Mar 23 15:10:51 2009
@@ -87,9 +87,9 @@
 %{__sed} -i -e 's,[ \t]\+$,,' iana-etc/services
 
 %{__make} \
-	OPT_FLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmcflags} %{rpmldflags}" \
-	CC="diet %{__cc}"
+	CC="diet %{__cc}" \
+	OPT_FLAGS="%{rpmcflags} -Os" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -148,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.151  2009/03/02 11:00:47  baggins
 - i love broken comment parsing
 

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.289 SPECS/udev.spec:1.290
--- SPECS/udev.spec:1.289	Mon Mar 23 14:03:13 2009
+++ SPECS/udev.spec	Mon Mar 23 15:10:51 2009
@@ -216,7 +216,7 @@
 	--cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-initrd.cache \
 %endif
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	%{?with_dietlibc:CC="%{_target_cpu}-dietlibc-gcc"} \
+	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os"} \
 	%{?with_klibc:CC="%{_bindir}/klcc"} \
 	%{?debug:--enable-debug} \
 	--exec-prefix="" \
@@ -457,6 +457,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.289  2009/03/23 13:03:13  baggins
 - Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
 

================================================================
Index: SPECS/xfsprogs.spec
diff -u SPECS/xfsprogs.spec:1.122 SPECS/xfsprogs.spec:1.123
--- SPECS/xfsprogs.spec:1.122	Sun Mar 22 23:49:29 2009
+++ SPECS/xfsprogs.spec	Mon Mar 23 15:10:51 2009
@@ -141,7 +141,7 @@
 	--disable-gettext \
 	--disable-readline \
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="-Wno-deprecated-declarations -Os -D_BSD_SOURCE -D__USE_XOPEN_EXTENDED"
+	OPTIMIZER="%{rpmcflags} -Wno-deprecated-declarations -Os -D_BSD_SOURCE -D__USE_XOPEN_EXTENDED"
 
 %{__make} -j1 include libxfs libxlog libxcmd libhandle libdisk
 %{__make} -j1 db growfs logprint mkfs mdrestore repair \
@@ -289,6 +289,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2009/03/23 14:10:51  baggins
+- unify dietlibc compile options and calls
+
 Revision 1.122  2009/03/22 22:49:29  baggins
 - rel 5
 - install initrd programs in _libdir/initrd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ash.spec?r1=1.75&r2=1.76&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/busybox.spec?r1=1.163&r2=1.164&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cryptsetup-luks.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dmraid.spec?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.205&r2=1.206&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgcrypt.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lua50.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lua51.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.133&r2=1.134&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mdadm.spec?r1=1.87&r2=1.88&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.72&r2=1.73&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/popt.spec?r1=1.98&r2=1.99&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/setup.spec?r1=1.151&r2=1.152&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.289&r2=1.290&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xfsprogs.spec?r1=1.122&r2=1.123&f=u



More information about the pld-cvs-commit mailing list