Author: baggins Date: Tue Mar 17 23:21:54 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.41.4 - added dietlibc build and bcond - build with dietlibc by default (30% smaller binaries than uClibc)
---- Files affected: SPECS: e2fsprogs.spec (1.201 -> 1.202) ---- Diffs: ================================================================ Index: SPECS/e2fsprogs.spec diff -u SPECS/e2fsprogs.spec:1.201 SPECS/e2fsprogs.spec:1.202 --- SPECS/e2fsprogs.spec:1.201 Tue Mar 17 14:24:27 2009 +++ SPECS/e2fsprogs.spec Wed Mar 18 00:21:49 2009 @@ -5,7 +5,8 @@ %bcond_without static # link e2fsck dynamically with libc %bcond_without nls # build without NLS %bcond_without initrd # don't build initrd version -%bcond_without uClibc # link initrd version with static glibc instead of uClibc +%bcond_with uClibc # link initrd version with static glibc instead of uClibc +%bcond_without dietlibc # link initrd version with dietlibc instead of uClibc # %ifarch sparc64 sparc %undefine with_uClibc @@ -35,12 +36,12 @@ Summary(zh_CN.UTF-8): 管理第二扩展（ext2）文件系统的工具。 Summary(zh_TW.UTF-8): 用於管理 ext2 檔案系統的工具程式。 Name: e2fsprogs -Version: 1.41.3 -Release: 3 +Version: 1.41.4 +Release: 1 License: GPL v2 (with LGPL v2 and BSD parts) Group: Applications/System Source0: http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz -# Source0-md5: b21d26fc46c584021dc9c444933ee1c2 +# Source0-md5: 59033388df36987d2b9c9bbf7e19bd57 Source1: e2compr-0.4.texinfo.gz # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 @@ -48,6 +49,7 @@ Patch0: %{name}-info.patch Patch1: e2compr-info.patch Patch2: %{name}-498381.patch +Patch3: %{name}-diet.patch URL: http://e2fsprogs.sourceforge.net/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -59,8 +61,16 @@ BuildRequires: libselinux-static BuildRequires: libsepol-static %endif -%if %{with initrd} && %{with uClibc} +%if %{with initrd} + %if %{with uClibc} BuildRequires: uClibc-static >= 2:0.9.29 + %else + %if %{with dietlibc} +BuildRequires: dietlibc-static + %else +BuildRequires: glibc-static + %endif + %endif %endif Requires(post,postun): /sbin/ldconfig Requires: fsck = %{version}-%{release} @@ -602,6 +612,7 @@ %{__gzip} -dc < %{SOURCE1} > doc/e2compr.texinfo %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in @@ -615,19 +626,37 @@ %{__autoconf} %if %{with initrd} +%if %{with dietlibc} +# needed for syscall() +sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \ + -e 's|\(^STATIC_LIBUUID = .*\)|\1 -lcompat|g' MCONFIG.in +%endif %configure \ - %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ 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" \ --disable-elf-shlibs \ --disable-selinux \ - --disable-nls + --disable-nls \ + --disable-testio-debug \ + --disable-e2initrd-helper \ + --disable-uuidd \ + --disable-tls \ + --disable-nls \ + --disable-threads %{__make} -j1 libs %{__make} progs mv -f misc/blkid initrd-blkid +mv -f misc/mke2fs initrd-mke2fs +mv -f misc/fsck initrd-e2fsck %{__make} clean +%if %{with dietlibc} +sed -i -e 's|\(^LIBUUID = .*\) -lcompat|\1|g' \ + -e 's|\(^STATIC_LIBUUID = .*\) -lcompat|\1|g' MCONFIG.in +%endif %endif %configure \ @@ -714,7 +743,11 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab -%{?with_initrd:install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid} +%if %{with initrd} +install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid +install initrd-e2fsck $RPM_BUILD_ROOT/sbin/initrd-e2fsck +install initrd-mke2fs $RPM_BUILD_ROOT/sbin/initrd-mke2fs +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -1018,7 +1051,7 @@ %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) /sbin/initrd-blkid +%attr(755,root,root) /sbin/initrd-* %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -1027,6 +1060,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.202 2009/03/17 23:21:49 baggins +- 1.41.4 +- added dietlibc build and bcond +- build with dietlibc by default (30% smaller binaries than uClibc) + Revision 1.201 2009/03/17 13:24:27 baggins - rel 3 - no parallel build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.201&r2=1.202&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
