aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-03-26 16:31:06 -0700
committerTheodore Ts'o <tytso@mit.edu>2012-03-26 21:38:39 -0700
commit81d72f7378bc6376898060e2f160650a76d7bd68 (patch)
treed632c3d684b5dc4a3bd9879bfb3e12b153ec76db /debian
parentd973c18b33df378b071a951e942954e79f316567 (diff)
downloade2fsprogs-81d72f7378bc6376898060e2f160650a76d7bd68.tar.gz
e2fsprogs-81d72f7378bc6376898060e2f160650a76d7bd68.tar.xz
e2fsprogs-81d72f7378bc6376898060e2f160650a76d7bd68.zip
debian: compile without using dietlibc if SKIP_DIETLIBC=yes
Some distributions such as Ubuntu don't have dietlibc. If SKIP_DIETLIBC=yes appears in rules.custom, this will change the control file and cause the build rules to skip using dietlibc when building the BUILD-BF version of e2fsprogs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'debian')
-rw-r--r--debian/control.in4
-rwxr-xr-xdebian/rules10
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/control.in b/debian/control.in
index b131526b..135ca92f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,11 +3,13 @@ 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: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, dietlibc-dev (>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc], gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
+Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
Standards-Version: 3.9.2
Homepage: http://e2fsprogs.sourceforge.net
diff --git a/debian/rules b/debian/rules
index afb548cf..b2db89ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -191,6 +191,14 @@ 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
+endif
+
FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \
libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \
e2fslibs.files e2fslibs-dev.files
@@ -270,7 +278,7 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
if type diet > /dev/null 2>&1 ; then \
cd ${staticbuilddir} && AWK=/usr/bin/awk \
${topdir}/configure ${STATIC_CONF_FLAGS} \
- --with-diet-libc CFLAGS="${CFLAGS}"; \
+ ${WITH_DIET_LIBC} CFLAGS="${CFLAGS}"; \
else \
cd ${staticbuilddir} && AWK=/usr/bin/awk \
${topdir}/configure ${STATIC_CONF_FLAGS} \