packages: xfsprogs/xfsprogs.spec - fix building with dietlibc - relase 2

[wiget]

Author: wiget                        Date: Fri Aug 28 19:21:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with dietlibc
- relase 2

---- Files affected:
packages/xfsprogs:
   xfsprogs.spec (1.125 -> 1.126) 

---- Diffs:

================================================================
Index: packages/xfsprogs/xfsprogs.spec
diff -u packages/xfsprogs/xfsprogs.spec:1.125 packages/xfsprogs/xfsprogs.spec:1.126
--- packages/xfsprogs/xfsprogs.spec:1.125	Sun May 17 23:10:10 2009
+++ packages/xfsprogs/xfsprogs.spec	Fri Aug 28 21:21:18 2009
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
 Version:	3.0.1
-Release:	1
+Release:	2
 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
@@ -45,6 +45,9 @@
 %define		_bindir		/usr/sbin
 %define		_libdir		/%{_lib}
 %define		_libexecdir	/usr/%{_lib}
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%define         dietarch        %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%define         dietlibdir      %{_prefix}/lib/dietlibc/lib-%{dietarch}
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -144,9 +147,11 @@
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
 	OPTIMIZER="%{rpmcflags} -Wno-deprecated-declarations -Os -D_BSD_SOURCE -D__USE_XOPEN_EXTENDED"
 
-%{__make} -j1 include libxfs libxlog libxcmd libhandle libdisk
+%{__make} -j1 include libxfs libxlog libxcmd libhandle libdisk \
+	LIBUUID="%{dietlibdir}/libuuid.a"
 %{__make} -j1 db growfs logprint mkfs mdrestore repair \
-	LDFLAGS="%{rpmldflags} -all-static"
+	LDFLAGS="%{rpmldflags} -all-static" \
+	LIBUUID="%{dietlibdir}/libuuid.a"
 
 mkdir -p initrd
 mv -f db/xfs_db initrd/xfs_db
@@ -292,6 +297,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2009/08/28 19:21:18  wiget
+- fix building with dietlibc
+- relase 2
+
 Revision 1.125  2009/05/17 21:10:10  charles
 - BR: readline-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs.spec?r1=1.125&r2=1.126&f=u