From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 12 May 2016 04:00:38 +0000 (-0400)
Subject: debian: stop using dietlibc to build the static binaries
X-Git-Tag: v1.43-WIP-2016-05-12~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d4a5b0bd9386dc2bb2643e136bb80f384be2a0;p=thirdparty%2Fe2fsprogs.git

debian: stop using dietlibc to build the static binaries

It's better to keep the e2fsprogs binaries consistently all using
glibc.

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

diff --git a/debian/control.in b/debian/control.in
index 6da9a82aa..979f54e93 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,13 +3,11 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},REMOVE_ME))dnl
 define(UTIL_LINUX_NG_DEFINES,
 ifdef(`UTIL_LINUX_NG', ``libblkid-dev (>= 2.16), uuid-dev (>= 2.16),''))dnl
-define(DIETLIBC_DEFINES,
-ifdef(`DIETLIBC', ``dietlibc-dev (>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc],''))dnl
 Source: e2fsprogs
 Section: admin
 Priority: required
 Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
-Build-Depends: gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], libfuse-dev, libattr1-dev, debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
+Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse-dev, libattr1-dev, debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
 Standards-Version: 3.9.7
 Homepage: http://e2fsprogs.sourceforge.net
 
diff --git a/debian/rules b/debian/rules
index fbe225f11..b13e4830f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -223,14 +223,6 @@ else
 M4_ARGS+=-UDO_MULTIARCH
 endif
 
-ifneq ($(SKIP_DIETLIBC),)
-M4_ARGS+=-UDIETLIBC
-WITH_DIET_LIBC = 
-else
-M4_ARGS+=-DDIETLIBC
-WITH_DIET_LIBC = --with-diet-libc --enable-libuuid --enable-libblkid
-endif
-
 ifneq ($(BUILD_E2FSCK_STATIC),no)
 M4_ARGS+=-DE2FSCK_STATIC
 else
@@ -328,18 +320,9 @@ ${CFGSTATICSTAMP}:
 
 	mkdir -p ${staticbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	if type diet > /dev/null  2>&1 ; then \
-		cd ${staticbuilddir} && AWK=/usr/bin/awk \
-		${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \
-		${EXTRA_CONF_FLAGS} ${WITH_DIET_LIBC} CFLAGS="${CFLAGS}" \
-		CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"; \
-	else \
-		cd ${staticbuilddir} && AWK=/usr/bin/awk \
-			${topdir}/configure ${COMMON_CONF_FLAGS} \
-			${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
-			CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \
-			LDFLAGS="$(LDFLAGS)"; \
-	fi
+	cd ${staticbuilddir} && AWK=/usr/bin/awk ${topdir}/configure \
+		${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
+		CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 else
 	cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
 		${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \