Patchwork e2fsprogs: remove checker infrastructure

login
register
mail settings
Submitter Eric Sandeen
Date April 17, 2014, 10:05 p.m.
Message ID <53505032.5060303@redhat.com>
Download mbox | patch
Permalink /patch/340089/
State Accepted
Headers show

Comments

Eric Sandeen - April 17, 2014, 10:05 p.m.
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>
---

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

-Eric


--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - July 4, 2014, 12:48 p.m.
On Thu, Apr 17, 2014 at 05:05:38PM -0500, Eric Sandeen wrote:
> 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>

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
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Sandeen - July 7, 2014, 3:01 p.m.
On 7/4/14, 7:48 AM, Theodore Ts'o wrote:
> On Thu, Apr 17, 2014 at 05:05:38PM -0500, Eric Sandeen wrote:
>> 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>
> 
> 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

> Cheers,
> 
> 					- Ted

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/configure b/configure
index 6449f59..60a4c8a 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/configure.in b/configure.in
index 8a033b0..a13be2c 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/lib/Makefile.checker b/lib/Makefile.checker
deleted file mode 100644
index 7bff0f4..0000000
--- a/lib/Makefile.checker
+++ /dev/null
@@ -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 $@.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/;;'`/$@ $@)
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 69b5b4c..2ae223c 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -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 $<
 
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 761ac48..eb307aa 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -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 $<
 
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 4f2d31f..ca332b5 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -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 $<
 
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 0c880c7..427fcb8 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -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 $<
 
diff --git a/lib/quota/Makefile.in b/lib/quota/Makefile.in
index 0344d09..207dd9e 100644
--- a/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
@@ -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 \
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 4c1ef8f..fdae4a5 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -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 $<
 
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index f5b767e..5b47318 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -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 $<