Whamcloud - gitweb
debian: Use dietlibc when possible for building e2fsck.static
authorTheodore Ts'o <tytso@mit.edu>
Fri, 12 Sep 2008 13:26:45 +0000 (09:26 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 12 Sep 2008 13:26:45 +0000 (09:26 -0400)
This fixes a regression introduced in commit 4f2e8f19 where we
inadvertently disabled the use of dietlibc on all architectures,
instead of just on those architectures which didn't support dietlibc.

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

index 09fac76..dc33274 100755 (executable)
@@ -196,10 +196,13 @@ ${CFGSTATICSTAMP}:
        mkdir -p ${staticbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        if type diet > /dev/null  2>&1 ; then \
-               STATIC_CONF_FLAGS="$STATIC_CONF_FLAGS --with-diet-libc"; \
+               cd ${staticbuilddir} && AWK=/usr/bin/awk \
+                       ${topdir}/configure ${STATIC_CONF_FLAGS} \
+                       --with-diet-libc; \
+       else \
+               cd ${staticbuilddir} && AWK=/usr/bin/awk \
+                       ${topdir}/configure ${STATIC_CONF_FLAGS}; \
        fi
-       cd ${staticbuilddir} && AWK=/usr/bin/awk \
-               ${topdir}/configure ${STATIC_CONF_FLAGS}
 else
        cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \