mirror of https://github.com/vitalif/e2fsprogs
debian: rationalize configure options management
As part of the debian build, the e2fsprogs sources are built multiple times --- for the udeb packages, for e2fsck.static, etc. Make sure that when we disable the use of the built-in blkid and uuid libraries (in favor of the ones shipped with util-linux), that we do so for all of the builds. Previously we were using the internal blkid library for e2fsck.static. While this isn't completely broken, the internal blkid library hasn't been maintained in quite some time, so it's better to use the util-linux blkid library instead. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>debian-1.42.9
parent
a25fffae5c
commit
efeda9d529
|
@ -152,13 +152,12 @@ endif
|
|||
|
||||
BF_CFLAGS = -Os -fomit-frame-pointer
|
||||
|
||||
COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-elf-shlibs \
|
||||
--enable-quota --infodir=/usr/share/info
|
||||
ifeq ($(UTIL_LINUX_NG),yes)
|
||||
COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid \
|
||||
UTIL_CONF_FLAGS ?= --disable-fsck --disable-libblkid \
|
||||
--disable-libuuid --disable-uuidd
|
||||
else
|
||||
COMMON_CONF_FLAGS += --enable-fsck
|
||||
UTIL_CONF_FLAGS ?= --enable-fsck --enable-libblkid \
|
||||
--enable-libuuid --enable-uuidd
|
||||
endif
|
||||
|
||||
ifneq ($(strip $(DEB_HOST_MULTIARCH)),)
|
||||
|
@ -173,10 +172,14 @@ endif
|
|||
|
||||
BACKTRACE_CONF_FLAGS ?= $(shell if ${debdir}/scripts/test-backtrace ; then echo --disable-backtrace ; fi)
|
||||
|
||||
STD_CONF_FLAGS ?= --enable-symlink-install $(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS)
|
||||
COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-quota \
|
||||
--infodir=/usr/share/info --enable-symlink-install \
|
||||
$(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS) $(UTIL_CONF_FLAGS)
|
||||
|
||||
BF_CONF_FLAGS ?= --disable-nls --disable-imager --disable-testio-debug \
|
||||
--disable-uuidd --disable-tls --disable-debugfs
|
||||
STD_CONF_FLAGS ?= --enable-elf-shlibs
|
||||
|
||||
BF_CONF_FLAGS ?= --enable-elf-shlibs --disable-nls --disable-imager \
|
||||
--disable-testio-debug --disable-uuidd --disable-tls --disable-debugfs
|
||||
|
||||
STATIC_CONF_FLAGS ?= --disable-nls --disable-imager \
|
||||
--disable-uuidd --disable-tls
|
||||
|
@ -253,24 +256,28 @@ ${CFGSTDSTAMP}:
|
|||
mkdir -p ${stdbuilddir}
|
||||
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
||||
cd ${stdbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)"
|
||||
else
|
||||
cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
endif
|
||||
|
||||
# specially-built MIPS libs
|
||||
ifneq ($(ismips),)
|
||||
mkdir -p ${mipsbuilddir} ${mipsbuilddir64}
|
||||
cd ${mipsbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} \
|
||||
${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
cd ${mipsbuilddir64} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} \
|
||||
${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
endif
|
||||
|
||||
mkdir -p ${STAMPSDIR}
|
||||
|
@ -283,13 +290,15 @@ ${CFGBFSTAMP}:
|
|||
mkdir -p ${bfbuilddir}
|
||||
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
||||
cd ${bfbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS} ${BF_CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
else
|
||||
cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
endif
|
||||
mkdir -p ${STAMPSDIR}
|
||||
touch ${CFGBFSTAMP}
|
||||
|
@ -302,20 +311,22 @@ ${CFGSTATICSTAMP}:
|
|||
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} ${EXTRA_CONF_FLAGS} \
|
||||
${WITH_DIET_LIBC} CFLAGS="${CFLAGS}" \
|
||||
${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 ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} \
|
||||
${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)"; \
|
||||
fi
|
||||
else
|
||||
cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
endif
|
||||
mkdir -p ${STAMPSDIR}
|
||||
touch ${CFGSTATICSTAMP}
|
||||
|
|
Loading…
Reference in New Issue