From 7e8fe327b51051adcbb0d44169b1a933173ce1ff Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 27 Jan 2008 17:43:10 -0500 Subject: [PATCH] Don't build e2fsck statically by default anymore Also removed the --enable-dynamic-static configure option. Unfortunately the usefulness of building e2fsck statically is gone on all modern distributions, since everything else on the system is built dynamically these days. In fact on some distributions it is almost impossible to build programs statically any more. Signed-off-by: "Theodore Ts'o" --- configure | 25 ++----------------------- configure.in | 18 ------------------ debian/rules | 6 +++--- e2fsck/Makefile.in | 14 +++++--------- 4 files changed, 10 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 6cda01c..baac0b0 100755 --- a/configure +++ b/configure @@ -688,7 +688,6 @@ SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT -E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG @@ -1376,7 +1375,6 @@ Optional Features: --disable-debugfs disable support of debugfs program --disable-imager disable support of e2image program --disable-resizer disable support of e2resize program - --enable-dynamic-e2fsck build e2fsck dynamically --enable-fsck build fsck wrapper program --enable-e2initrd-helper build e2initrd-helper program --enable-blkid-devmapper build with device-mapper support @@ -4082,24 +4080,6 @@ RESIZER_CMT= fi -# Check whether --enable-dynamic-e2fsck was given. -if test "${enable_dynamic_e2fsck+set}" = set; then - enableval=$enable_dynamic_e2fsck; if test "$enableval" = "no" -then - E2FSCK_TYPE=static - echo "Building e2fsck statically" -else - E2FSCK_TYPE=shared - echo "Building e2fsck dynamically" -fi - -else - E2FSCK_TYPE=static -echo "Building e2fsck statically by default" - -fi - - # Check whether --enable-fsck was given. if test "${enable_fsck+set}" = set; then enableval=$enable_fsck; if test "$enableval" = "no" @@ -16057,7 +16037,7 @@ SWAPFS_CMT!$SWAPFS_CMT$ac_delim DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim IMAGER_CMT!$IMAGER_CMT$ac_delim RESIZER_CMT!$RESIZER_CMT$ac_delim -E2FSCK_TYPE!$E2FSCK_TYPE$ac_delim +FSCK_PROG!$FSCK_PROG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then @@ -16127,7 +16107,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -FSCK_PROG!$FSCK_PROG$ac_delim FSCK_MAN!$FSCK_MAN$ac_delim E2INITRD_PROG!$E2INITRD_PROG$ac_delim E2INITRD_MAN!$E2INITRD_MAN$ac_delim @@ -16213,7 +16192,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 799015d..6ef8533 100644 --- a/configure.in +++ b/configure.in @@ -441,24 +441,6 @@ RESIZER_CMT= ) AC_SUBST(RESIZER_CMT) dnl -dnl handle --enable-dynamic-e2fsck -dnl -AC_ARG_ENABLE([dynamic-e2fsck], -[ --enable-dynamic-e2fsck build e2fsck dynamically], -if test "$enableval" = "no" -then - E2FSCK_TYPE=static - echo "Building e2fsck statically" -else - E2FSCK_TYPE=shared - echo "Building e2fsck dynamically" -fi -, -E2FSCK_TYPE=static -echo "Building e2fsck statically by default" -) -AC_SUBST(E2FSCK_TYPE) -dnl dnl See whether to install the `fsck' wrapper program (that calls e2fsck) dnl AC_ARG_ENABLE([fsck], diff --git a/debian/rules b/debian/rules index b5c00e7..6e74c2f 100755 --- a/debian/rules +++ b/debian/rules @@ -97,8 +97,7 @@ endif BF_CCOPTS = -Os -fomit-frame-pointer COMMON_CONF_FLAGS = \ - --enable-elf-shlibs --enable-dynamic-e2fsck \ - --infodir=/usr/share/info --enable-fsck + --enable-elf-shlibs --infodir=/usr/share/info --enable-fsck STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \ ${DEVMAPPER} @@ -199,6 +198,7 @@ build-std: ${BUILDSTDSTAMP} ${BUILDSTDSTAMP}: ${CFGSTDSTAMP} dh_testdir $(MAKE) -C ${stdbuilddir} all + $(MAKE) -C ${stdbuilddir}/e2fsck e2fsck.static ( cd ${stdbuilddir}/doc && \ texi2html -split_chapter ${topdir}/doc/libext2fs.texinfo ) @@ -231,7 +231,7 @@ build-static: ${BUILDSTATICSTAMP} ${BUILDSTATICSTAMP}: ${CFGSTATICSTAMP} dh_testdir $(MAKE) -C ${staticbuilddir} libs - $(MAKE) -C ${staticbuilddir}/e2fsck all + $(MAKE) -C ${staticbuilddir}/e2fsck all e2fsck.static touch ${BUILDSTATICSTAMP} clean: diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 95c4399..595c104 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -104,7 +104,7 @@ SRCS= $(srcdir)/e2fsck.c \ prof_err.c \ $(MTRACE_SRC) -all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) $(FMANPAGES) +all:: profiled $(PROGS) e2fsck $(MANPAGES) $(FMANPAGES) @PROFILE_CMT@all:: e2fsck.profiled @@ -112,19 +112,15 @@ prof_err.c prof_err.h: prof_err.et @echo " COMPILE_ET prof_err.et" @$(COMPILE_ET) $(srcdir)/prof_err.et -e2fsck: e2fsck.@E2FSCK_TYPE@ - @echo " CP $@" - @$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck +e2fsck: $(OBJS) $(DEPLIBS) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) -e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) +e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) @echo " LD $@" @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \ $(STATIC_LIBS) -e2fsck.shared: $(OBJS) $(DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS) - e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) @echo " LD $@" @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ -- 1.8.3.1