From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 3 Dec 2011 10:46:49 +0000 (+0100)
Subject: e2fsprogs: Cleanup package.
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=918f28d16180a7107247ab47104f6632c1e2830d

e2fsprogs: Cleanup package.

The --host=... and --build=... flags were ignored and the
testsuite crashed when there was no /etc/mtab.
---

diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
index 1fce087e9..7b80dcdc9 100644
--- a/e2fsprogs/e2fsprogs.nm
+++ b/e2fsprogs/e2fsprogs.nm
@@ -31,10 +31,6 @@ build
 	prepare_cmds
 		mkdir -pv %{DIR_APP}/build
 
-		# Fix DT_TEXTREL in e2fsprogs libraries. --disable-shared and
-		# --with-pic are not options in E2fsprogs:
-		find lib/ -name Makefile.in -exec sed -i "s/\%{ALL_CFLAGS}/& -fPIC/" {} \;
-
 		# At run time libblkid looks for the BLKID_DEBUG environment variable to
 		# enable debbugging, with getenv(3). Some suid-root programs use libblkid,
 		# such as mount(1). e2fsprogs includes a safe_getenv() function, which calls
@@ -42,25 +38,30 @@ build
 		# variables if the user is suid or sgid. So, this command replaces getenv()
 		# with safe_getenv():
 		sed \
-			-e "s/getenv(\"BLKID_DEBUG\")/safe_getenv(\"BLKID_DEBUG\")/" \
+			-e 's/getenv("BLKID_DEBUG")/safe_getenv("BLKID_DEBUG")/' \
 			-i lib/blkid/cache.c
 	end
 
+	configure_options += \
+		--with-root-prefix="" \
+		--enable-elf-shlibs \
+		--disable-libblkid \
+		--disable-fsck \
+		--disable-uuidd \
+		--disable-libuuid
+
 	build
 		cd build
 		../configure \
-			--prefix=/usr \
-			--with-root-prefix="" \
-			--enable-elf-shlibs \
-			--disable-libblkid \
-			--disable-fsck \
-			--disable-uuidd \
-			--disable-libuuid
+			%{configure_options}
 
 		make %{PARALLELISMFLAGS}
 	end
 
 	test
+		# Create empty mtab file if it does not exist.
+		[ -e /etc/mtab ] || touch /etc/mtab
+
 		cd build && make check
 	end