From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 27 Mar 2012 04:41:47 +0000 (-0700)
Subject: debian: don't build BUILD-BF if SKIP_BF=yes
X-Git-Tag: v1.42.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be241786e36e4324a64b144df7def72e0b1f93b2;p=thirdparty%2Fe2fsprogs.git

debian: don't build BUILD-BF if SKIP_BF=yes

Trade off build time for space by using the binaries from BUILD-STD
and not building BUILD-BF if SKIP_BF=yes in the rules.custom file.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/debian/rules b/debian/rules
index b2db89ed4..692eebc9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,6 @@ maindir		?= ${debdir}/e2fsprogs
 e2fsckstaticdir	?= ${debdir}/e2fsck-static
 debugdir	?= ${debdir}/e2fsprogs-dbg
 stdbuilddir	?= ${debdir}/BUILD-STD
-bfbuilddir	?= ${debdir}/BUILD-BF
 staticbuilddir	?= ${debdir}/BUILD-STATIC
 mipsbuilddir	?= ${debdir}/BUILD-MIPS
 mipsbuilddir64	?= ${debdir}/BUILD-MIPS-64
@@ -135,6 +134,14 @@ else
 E2FSCK_STATIC = ${stdbuilddir}/e2fsck/e2fsck.static
 endif
 
+ifeq ($(SKIP_BF),yes)
+BUILD_BF =
+bfbuilddir	?= ${stdbuilddir}
+else
+BUILD_BF = build-bf
+bfbuilddir	?= ${debdir}/BUILD-BF
+endif
+
 BF_CFLAGS = -Os -fomit-frame-pointer
 
 COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-elf-shlibs \
@@ -295,7 +302,7 @@ endif
 
 build-arch: build
 build-indep: build
-build: build-std build-bf $(BUILD_STATIC)
+build: build-std $(BUILD_BF) $(BUILD_STATIC)
 
 build-std: ${BUILDSTDSTAMP}
 ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
@@ -409,10 +416,10 @@ install-udeb: build
 		-a ! -name mke2fs -a ! -name tune2fs \
 		-a ! -name resize2fs -a ! -name badblocks -print | xargs rm
 
-	(cd ${udebdir}/sbin; ln -s e2fsck fsck.ext2 ; \
-		ln -s e2fsck fsck.ext3 ; ln -s e2fsck fsck.ext4 ; \
-		ln -s mke2fs mkfs.ext2 ; ln -s mke2fs mkfs.ext3 ; \
-		ln -s mke2fs mkfs.ext4)
+	(cd ${udebdir}/sbin; ln -sf e2fsck fsck.ext2 ; \
+		ln -sf e2fsck fsck.ext3 ; ln -sf e2fsck fsck.ext4 ; \
+		ln -sf mke2fs mkfs.ext2 ; ln -sf mke2fs mkfs.ext3 ; \
+		ln -sf mke2fs mkfs.ext4)
 
 ifneq ($(UTIL_LINUX_NG),yes)
 	mkdir -p ${blkidudebdir}/lib