From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 25 Sep 2011 19:40:24 +0000 (-0400)
Subject: debian: don't bomb out if DEB_BUILD_OPTIONS contains nostrip
X-Git-Tag: v1.42-WIP-1001~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20d7949583a7efbf9b93f7e3d47983e10629530e;p=thirdparty%2Fe2fsprogs.git

debian: don't bomb out if DEB_BUILD_OPTIONS contains nostrip

The debugging packages will contain no debugging symbols (since they
are in the unstripped executables and libraries) but at least the
build won't crash.

Addresses-Debian-Bug: #627535

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

diff --git a/debian/rules b/debian/rules
index 84643b5e5..6b55b909d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -499,6 +499,7 @@ ifneq ($(UTIL_LINUX_NG),yes)
 	rm -rf ${uuidudebdir}/usr
 endif
 
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	mkdir -p ${debugdir}/$(USRLIB)
 	mv ${maindir}/usr/lib/debug ${debugdir}/$(USRLIB)
 	rm -rf ${maindir}/usr/lib/debug
@@ -532,6 +533,7 @@ ifneq ($(UTIL_LINUX_NG),yes)
 	mkdir -p ${libblkiddbgdir}/$(USRLIB)
 	mv ${libblkiddir}/usr/lib/debug ${libblkiddbgdir}/$(USRLIB)
 	rmdir ${libblkiddir}/usr/lib
+endif
 endif
 
 	# dpkg symbol handling