e2fsprogs: remove checker infrastructure

PATCH Applied Eric Sandeen 2 participants 3 messages Apr 17, 2014 – Jul 7, 2014 Library code

lore

Share & tools

lore

Eric Sandeen

author

2014-04-17 22:05 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

This hits "configure" too,but maybe you just want to regenerate it from the configure.in change, I dunno.

-Eric

configure +0 ~~-30~~

index 6449f59..60a4c8a 100755
@@ -4697,36 +4697,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
-
-
-
-
-
-
-
-
 # Check whether --enable-jbd-debug was given.
 if test "${enable_jbd_debug+set}" = set; then :
   enableval=$enable_jbd_debug; if test "$enableval" = "no"

configure.in +1 ~~-22~~

index 8a033b0..a13be2c 100644
@@ -392,28 +392,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

lib/Makefile.checker deleted +0 ~~-17~~

deleted file mode 100644
index 7bff0f4..0000000
@@ -1,17 +0,0 @@
-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 [email protected] && $(MV) $@ [email protected])
-	$(Q) (cd checker; $(ARGEN) $@ $(OBJS))
-	-$(Q) $(RANLIB) $@
-	$(Q) $(RM) -f ../$@
-	$(Q) (cd .. ; $(LN) $(LINK_BUILD_FLAGS) \
-	     `echo $(my_dir) | sed -e 's;lib/;;'`/$@ $@)

lib/blkid/Makefile.in +0 -1

index 69b5b4c..2ae223c 100644
@@ -58,7 +58,6 @@ DEPLIBS_BLKID=	$(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

lib/e2p/Makefile.in +0 -1

index 761ac48..eb307aa 100644
@@ -58,7 +58,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

lib/et/Makefile.in +0 -1

index 4f2d31f..ca332b5 100644
@@ -46,7 +46,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

lib/ext2fs/Makefile.in +0 -1

index 0c880c7..427fcb8 100644
@@ -207,7 +207,6 @@ all:: ext2fs.pc
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

lib/quota/Makefile.in +0 -3

index 0344d09..207dd9e 100644
@@ -50,7 +50,6 @@ LIBDIR= quota
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

@@ -65,8 +64,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 \

lib/ss/Makefile.in +0 -1

index 4c1ef8f..fdae4a5 100644
@@ -37,7 +37,6 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

lib/uuid/Makefile.in +0 -1

index f5b767e..5b47318 100644
@@ -65,7 +65,6 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
 	$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
 	$(Q) $(CPPCHECK_CMD) $<
 @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 $<

Theodore Ts'o

Applied

2014-07-04 12:48 UTC #1 lore raw

Quoted 8 lines · Eric Sandeen

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 <[email protected]>

Thanks, applied, with the necessary fixups so that e2fsprogs would actually compile afterwards. :-)

(You didn't remove the @MAKEFILE_CHECKER@ from the Makefiles, and left a dependency on lib/Makefile.checker in MCONFIG.)

Cheers,

- Ted

Eric Sandeen

author

2014-07-07 15:02 UTC #2 lore raw

Quoted 8 lines · Theodore Ts'o

Quoted 7 lines · Eric Sandeen
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.

Quoted 7 lines

Quoted 1 line
Signed-off-by Eric Sandeen <[email protected]>
Thanks, applied, with the necessary fixups so that e2fsprogs would actually compile afterwards. :-)
(You didn't remove the @MAKEFILE_CHECKER@ from the Makefiles, and left a dependency on lib/Makefile.checker in MCONFIG.)

Gah, sorry. Thanks for fixing, not sure how I did that.

-Eric

Quoted 3 lines

Cheers,
- Ted