From 00d1530a2d0a01eae94c7a356637639800b06100 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 19 Mar 2009 15:49:28 +0000 Subject: [PATCH] - WIP on building initrd, dietlibc version Changed files: xfsprogs.spec -> 1.118 --- xfsprogs.spec | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/xfsprogs.spec b/xfsprogs.spec index 2f1865d..423282b 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,8 +1,13 @@ +# +# Conditional build: +%bcond_without initrd # don't build initrd version +%bcond_without dietlibc # link initrd version with static glibc instead of dietlibc +# Summary: Tools for the XFS filesystem Summary(pl.UTF-8): Narzędzia do systemu plików XFS Name: xfsprogs Version: 3.0.0 -Release: 3 +Release: 3.1 License: LGPL v2.1 (libhandle), GPL v2 (the rest) Group: Applications/System Source0: ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz @@ -13,6 +18,7 @@ Patch2: %{name}-sharedlibs.patch Patch3: %{name}-pl.po-update.patch Patch4: %{name}-dynamic_exe.patch Patch5: %{name}-LDFLAGS.patch +Patch6: %{name}-diet.patch URL: http://oss.sgi.com/projects/xfs/ BuildRequires: autoconf BuildRequires: automake @@ -86,17 +92,49 @@ Biblioteki statyczne do XFS. # %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 rm -f include/{builddefs,platform_defs}.h %build %{__aclocal} -I m4 + +%if %{with initrd} +sed -i -e 's|^AC_PACKAGE_NEED_AIO_H|dnl AC_PACKAGE_NEED_AIO_H|' \ + -e 's|^AC_PACKAGE_NEED_LIO_LISTIO|dnl AC_PACKAGE_NEED_LIO_LISTIO|' \ + configure.in +sed -i -e 's|\(^LIBRT.*=.*\)|# \1|' include/builddefs.in +sed -i -e 's|\(^LLDLIBS.*=.*\)|\1 -lcompat|' db/Makefile mkfs/Makefile + +%{__autoconf} +%configure \ + CC="diet %{__cc} -static" \ + --disable-gettext \ + --disable-readline \ + --disable-shared \ + --enable-static \ + DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \ + OPTIMIZER="-Wno-deprecated-declarations -Os -D_BSD_SOURCE" + +%{__make} -j1 include libxfs libxlog libxcmd libhandle libdisk +%{__make} -j1 db growfs logprint mkfs mdrestore repair + +sed -i -e 's|^dnl AC_PACKAGE_NEED_AIO_H|AC_PACKAGE_NEED_AIO_H|' \ + -e 's|^dnl AC_PACKAGE_NEED_LIO_LISTIO|AC_PACKAGE_NEED_LIO_LISTIO|' \ + configure.in +sed -i -e 's|# \(^LIBRT.*=.*\)|\1|' include/builddefs.in +sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile + +#{__make} clean +%endif + %{__autoconf} %configure \ --enable-gettext \ --enable-readline \ DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \ OPTIMIZER="%{rpmcflags}" + %{__make} -j1 %install -- 2.44.0