e2fsprogs: remove checker infrastructure

Per http://www.gnu.org/software/checker/ the gcc "-checker" option
is long deprecated.  Nuke it from e2fsprogs.

Most people would never hit this, but people who love to turn knobs,
such as the reporter of kernel.org bz#74171, might run into it and be
sad.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/MCONFIG.in b/MCONFIG.in
index 922273b..3c1a4cb 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -217,8 +217,9 @@ MANMODE=    444
 
 DEP_LIB_MAKEFILES = $(top_srcdir)/lib/Makefile.library \
        $(top_srcdir)/lib/Makefile.elf-lib  \
-       $(top_srcdir)/lib/Makefile.bsd-lib $(top_srcdir)/lib/Makefile.darwin-lib \
-       $(top_srcdir)/lib/Makefile.solaris-lib $(top_srcdir)/lib/Makefile.checker \
+       $(top_srcdir)/lib/Makefile.bsd-lib \
+       $(top_srcdir)/lib/Makefile.darwin-lib \
+       $(top_srcdir)/lib/Makefile.solaris-lib \
        $(top_srcdir)/lib/Makefile.profile
 
 $(top_builddir)/config.status: $(top_srcdir)/configure

diff --git a/configure b/configure
index 39998de..c092185 100755 (executable)
--- a/configure
+++ b/configure
@@ -763,7 +763,6 @@ LDFLAG_DYNAMIC
 PROFILED_LIB_EXT
 STATIC_LIB_EXT
 LIB_EXT
-CHECKER_CMT
 PROFILE_CMT
 BSDLIB_CMT
 ELF_CMT
@@ -842,7 +841,6 @@ ac_subst_files='MCONFIG
 MAKEFILE_ELF
 MAKEFILE_BSDLIB
 MAKEFILE_PROFILE
-MAKEFILE_CHECKER
 MAKEFILE_LIBRARY
 ASM_TYPES_HEADER
 PUBLIC_CONFIG_HEADER'
@@ -865,7 +863,6 @@ enable_elf_shlibs
 enable_bsd_shlibs
 enable_profile
 enable_gcov
-enable_checker
 enable_jbd_debug
 enable_blkid_debug
 enable_testio_debug
@@ -1526,7 +1523,6 @@ Optional Features:
   --enable-bsd-shlibs    select BSD shared libraries
   --enable-profile       build profiling libraries
   --enable-gcov                  build for coverage testing using gcov
-  --enable-checker       build checker libraries
   --enable-jbd-debug     enable journal debugging
   --enable-blkid-debug    enable blkid debugging
   --disable-testio-debug  disable the use of the test I/O manager for debugging
@@ -5055,30 +5051,6 @@ fi
 
 fi
 
-# Check whether --enable-checker was given.
-if test "${enable_checker+set}" = set; then :
-  enableval=$enable_checker; if test "$enableval" = "no"
-then
-       CHECKER_CMT=#
-       MAKEFILE_CHECKER=/dev/null
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries" >&5
-$as_echo "Disabling checker libraries" >&6; }
-else
-       CHECKER_CMT=
-       MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building checker libraries" >&5
-$as_echo "Building checker libraries" >&6; }
-fi
-
-else
-  CHECKER_CMT=#
-MAKEFILE_CHECKER=/dev/null
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries by default" >&5
-$as_echo "Disabling checker libraries by default" >&6; }
-
-fi
-
-
 
 
 

diff --git a/configure.in b/configure.in
index 96a7f3e..b82f64e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -393,28 +393,7 @@ then
        AC_MSG_RESULT([Enabling gcov support])
 fi
 )
-dnl
-dnl handle --enable-checker
-dnl
-AC_ARG_ENABLE([checker],
-[  --enable-checker      build checker libraries],
-if test "$enableval" = "no"
-then
-       CHECKER_CMT=#
-       MAKEFILE_CHECKER=/dev/null
-       AC_MSG_RESULT([Disabling checker libraries])
-else
-       CHECKER_CMT=
-       MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
-       AC_MSG_RESULT([Building checker libraries])
-fi
-,
-CHECKER_CMT=#
-MAKEFILE_CHECKER=/dev/null
-AC_MSG_RESULT([Disabling checker libraries by default])
-)
-AC_SUBST(CHECKER_CMT)
-AC_SUBST_FILE(MAKEFILE_CHECKER)
+
 dnl
 dnl Substitute library extensions
 dnl

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index f773fea..9a2f8f5 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -43,15 +43,6 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
 
 #
-# Flags for using Checker
-#      Note: The optimization flags must include -g
-#
-#MCHECK=       -checker
-#LIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) $(CHECKLIB)
-#DEPLIBS= $(LIBCOM_ERR) $(LIB_EXT2FS) 
-#CHECKLIB= /usr/lib/libchecker.o
-
-#
 # Flags for doing mtrace --- uncomment to produce mtracing e2fsck
 #      Note:  The optimization flags must include -g
 #

diff --git a/lib/Makefile.checker b/lib/Makefile.checker
index 7bff0f4..0b5f9a3 100644 (file)
--- a/lib/Makefile.checker
+++ b/lib/Makefile.checker
@@ -1,17 +1,3 @@
-all:: $(LIBRARY)_chk.a
-
-real-subdirs:: Makefile
-       $(E) "  MKDIR checker"
-       $(Q) mkdir -p checker
-
-clean::
-       $(RM) -rf checker
-
-$(LIBRARY)_chk.a: $(OBJS)
-       $(E) "  GEN_CHECKER_LIB $@"
-       $(Q) (test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak)
-       $(Q) (cd checker; $(ARGEN) $@ $(OBJS))
-       -$(Q) $(RANLIB) $@
-       $(Q) $(RM) -f ../$@
-       $(Q) (cd .. ; $(LN) $(LINK_BUILD_FLAGS) \
-            `echo $(my_dir) | sed -e 's;lib/;;'`/$@ $@)
+# This is a placeholder so builds don't break after a "git pull"
+# which removed the checker infrastructure.  This file can be deleted
+# after e2fsprogs 1.44 is released

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 1472432..6cabd36 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -47,7 +47,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 LIBS_BLKID=    $(STATIC_LIBBLKID) $(STATIC_LIBUUID)
 DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
@@ -57,7 +56,6 @@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -179,7 +177,7 @@ clean::
                tst_devno tst_getsize tst_probe tst_read tst_resolve tst_save \
                tst_tag tst_types tests/*.out tests/*.ok \
                tests/*.img results test_probe core profiled/* \
-               checker/* blkid.h blkid_types.h ../libblkid.a ../libblkid_p.a \
+               blkid.h blkid_types.h ../libblkid.a ../libblkid_p.a \
                $(SMANPAGES) blkid
        @echo rmdir tests/tmp tests
        @(rmdir tests/tmp tests 2> /dev/null ; exit 0)

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 7cdb88c..1c71c1c 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -50,14 +50,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -102,7 +100,7 @@ uninstall::
        $(RM) -rf $(DESTDIR)$(includedir)/e2p
 
 clean::
-       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/*
+       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/*
        $(RM) -f ../libe2p.a ../libe2p_p.a tst_ostype tst_feature
 
 mostlyclean:: clean

diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 4441e1f..68c3baf 100644 (file)
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -45,7 +45,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -53,7 +52,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
        $(E) "  SUBST $@"

diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 7bb85c0..6cc299d 100644 (file)
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -219,7 +219,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 all:: ext2fs.pc tst_libext2fs
 
@@ -228,7 +227,6 @@ all:: ext2fs.pc tst_libext2fs
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -504,7 +502,7 @@ uninstall::
        $(RM) -rf $(DESTDIR)$(includedir)/ext2fs 
 
 clean::
-       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* \
+       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* \
                tst_badblocks tst_iscan ext2_err.et ext2_err.c ext2_err.h \
                tst_byteswap tst_ismounted tst_getsize tst_sectgetsize \
                tst_bitops tst_types tst_icount tst_super_size tst_csum \

diff --git a/lib/quota/Makefile.in b/lib/quota/Makefile.in
index 92df268..4dd42ed 100644 (file)
--- a/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
@@ -39,14 +39,12 @@ LIBDIR= quota
 #MAKEFILE_ELF#
 #MAKEFILE_BSDLIB#
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 #ELF_CMT#      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 #BSDLIB_CMT#   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -55,8 +53,6 @@ dict.o:
        $(Q) $(CC) -c $(ALL_CFLAGS) $(top_srcdir)/e2fsck/dict.c -o $@
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/dict.o -c \
 @PROFILE_CMT@  $(top_srcdir)/e2fsck/dict.c
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c \
-@CHECKER_CMT@  $(top_srcdir)/e2fsck/dict.c
 #ELF_CMT#      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c \
 #ELF_CMT#      $(top_srcdir)/e2fsck/dict.c
 #BSDLIB_CMT#   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c \
@@ -69,7 +65,7 @@ install:: all
 uninstall::
 
 clean::
-       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/*
+       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/*
        $(RM) -f ../libquota.a ../libquota_p.a $(SMANPAGES)
 
 #check:: tst_uuid

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 8f85bf1..24c5e37 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -36,7 +36,6 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
        $(Q) $(CC) $(ALL_CFLAGS) -c $<
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -63,7 +62,6 @@ all:: mk_cmds
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 CODE= $(SRCS) $(MKCMDSFILES)
 

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index a23e652..74ca478 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -57,14 +57,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 @MAKEFILE_ELF@
 @MAKEFILE_BSDLIB@
 @MAKEFILE_PROFILE@
-@MAKEFILE_CHECKER@
 
 .c.o:
        $(E) "  CC $<"
        $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
        $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 @PROFILE_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
-@CHECKER_CMT@  $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
 @ELF_CMT@      $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
@@ -168,7 +166,7 @@ uninstall::
        $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 
 clean::
-       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* uuid.h
+       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* uuid.h
        $(RM) -f ../libuuid.a ../libuuid_p.a tst_uuid uuid_time $(SMANPAGES)
 
 check:: tst_uuid