diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rw-r--r-- | configure.in | 19 | ||||
| -rw-r--r-- | intl/Makefile | 5 | ||||
| -rw-r--r-- | locale/Makefile | 3 | ||||
| -rw-r--r-- | po/Makefile | 6 | ||||
| -rw-r--r-- | posix/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/gnu/Makefile | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/Makefile | 5 |
12 files changed, 20 insertions, 65 deletions
@@ -1,5 +1,17 @@ 2011-09-08 Ulrich Drepper <drepper@gmail.com> + * Makefile: Remove support for automatic cvs check-ins. + * Makerules: Likewise. + * config.make.in: Likewise. + * configure.in: Likewise. + * intl/Makefile: Likewise. + * locale/Makefile: Likewise. + * po/Makefile: Likewise. + * posix/Makefile: Likewise. + * sysdeps/gnu/Makefile: Likewise. + * sysdeps/mach/hurd/Makefile: Likewise. + * sysdeps/sparc/sparc32/Makefile: Likewise. + [BZ #13118] * posix/Makefile (bug-regex32-ENV): Define. Patch by John Stanley <jpsinthemix@verizon.net>. @@ -33,20 +33,11 @@ all: lib others ifneq ($(AUTOCONF),no) -ifeq ($(with-cvs),yes) -define autoconf-it-cvs -test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@ -endef -else -autoconf-it-cvs = -endif - define autoconf-it @-rm -f $@.new $(AUTOCONF) $(ACFLAGS) $< > $@.new chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new mv -f $@.new $@ -$(autoconf-it-cvs) endef configure: configure.in aclocal.m4; $(autoconf-it) @@ -414,9 +405,6 @@ manual/dir-add.texi manual/dir-add.info: FORCE $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F) FAQ: scripts/gen-FAQ.pl FAQ.in $(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: $(PERL) $^' $@ -endif FORCE: iconvdata/% localedata/% po/% manual/%: FORCE @@ -1452,9 +1452,6 @@ $(gpl2lgpl): %: $(..)gpl2lgpl.sed /home/gd/gnu/lib/% # So I don't edit them by mistake. chmod a-w $@-tmp mv -f $@-tmp $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $^' $@ -endif endif endif diff --git a/config.make.in b/config.make.in index 407ebc1b68..8308d1d206 100644 --- a/config.make.in +++ b/config.make.in @@ -53,7 +53,6 @@ have-as-needed = @libc_cv_as_needed@ libgcc_s_suffix = @libc_cv_libgcc_s_suffix@ need-nopic-initfini = @nopic_initfini@ with-fp = @with_fp@ -with-cvs = @with_cvs@ old-glibc-headers = @old_glibc_headers@ unwind-find-fde = @libc_cv_gcc_unwind_find_fde@ have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@ diff --git a/configure.in b/configure.in index 65ace27b76..2ad7906353 100644 --- a/configure.in +++ b/configure.in @@ -93,18 +93,6 @@ AC_ARG_WITH([xcoff], [if using the XCOFF object format]), [xcoff=$withval], [xcoff=no]) -AC_ARG_WITH([cvs], - AC_HELP_STRING([--without-cvs], - [if CVS should not be used]), - [with_cvs=$withval], - [with_cvs=yes]) -if test "$with_cvs" = yes; then - if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null - then - with_cvs=no - fi -fi -AC_SUBST(with_cvs) AC_ARG_WITH([headers], AC_HELP_STRING([--with-headers=PATH], @@ -1061,8 +1049,7 @@ whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works, libc_cv_autoconf_works, [dnl test $libc_cv_autoconf_works = yes || AUTOCONF=no ;; esac -if test "x$with_cvs" = xyes && test "x$AUTOCONF" = xno; then - # If --without-cvs they probably won't change configure.in, so no complaints. +if test "x$AUTOCONF" = xno; then aux_missing="$aux_missing autoconf" fi @@ -1492,13 +1479,13 @@ __attribute__ ((destructor)) void dtor (void) { puts("dtor"); } ], [dnl AS_IF([$READELF -WS conftest$ac_exeext | $AWK ' - { gsub(/\@<:@ */, "@<:@") } + { gsub(/\@<:@ */, "@<:@") } $2 == ".ctors" || $2 == ".dtors" { size = strtonum("0x" $6) align = strtonum("0x" $NF) seen@<:@$2@:>@ = 1 stub@<:@$2@:>@ = size == align * 2 - } + } END { ctors_ok = !seen@<:@".ctors"@:>@ || stub@<:@".ctors"@:>@ dtors_ok = !seen@<:@".dtors"@:>@ || stub@<:@".dtors"@:>@ diff --git a/intl/Makefile b/intl/Makefile index 1511edd490..ee53836998 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 1995-2003, 2005, 2008, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -53,9 +53,6 @@ generated-dirs := domaindir localedir ifneq (no,$(BISON)) plural.c: plural.y $(BISON) $(BISONFLAGS) $@ $^ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -m'$(BISON) $(BISONFLAGS) $@ $^' $@ -endif endif $(objpfx)plural.o: plural.c diff --git a/locale/Makefile b/locale/Makefile index ccaebf190f..cd221774ad 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -86,9 +86,6 @@ $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o) C-translit.h: C-translit.h.in gen-translit.pl $(PERL) gen-translit.pl < $< > $@.tmp mv -f $@.tmp $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@ -endif localepath = "$(localedir):$(i18ndir)" diff --git a/po/Makefile b/po/Makefile index 4d2f406525..55314e0b4f 100644 --- a/po/Makefile +++ b/po/Makefile @@ -74,9 +74,6 @@ libc.pot: header.pot libc.pot.files -f $(objdir)/tmp-libc.pot-files po/$@.new rm $(objdir)/tmp-libc.pot-files mv -f $@.new $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@ -endif po-sed-cmd = \ '/\/tst-/d;$(foreach S,[ch] cxx sh ksh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))' @@ -116,9 +113,6 @@ ifneq (,$(pofiles)) chmod 444 $@ linguas: $(pofiles:$(podir)/%=%) -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -m'Copied from $(podir)' $^ -endif linguas.mo: $(pofiles:$(podir)/%.po=%.mo) endif diff --git a/posix/Makefile b/posix/Makefile index b200342117..40e8d5fb73 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -219,16 +219,10 @@ tst-execvp3-ARGS = --test-dir=$(objpfx) testcases.h: TESTS TESTS2C.sed sed -f TESTS2C.sed < $< > $@T mv -f $@T $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@ -endif ptestcases.h: PTESTS PTESTS2C.sed sed -f PTESTS2C.sed < $< > $@T mv -f $@T $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@ -endif # Run a test on the header files we use. # XXX Please note that for now we ignore the result of this test. diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile index b33d1004a5..44ee61db43 100644 --- a/sysdeps/gnu/Makefile +++ b/sysdeps/gnu/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010 +# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010,2011 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -26,9 +26,6 @@ $(..)sysdeps/gnu/errlist.c: $(..)sysdeps/gnu/errlist.awk \ # Make it unwritable so noone will edit it by mistake. -chmod a-w $@-tmp mv -f $@-tmp $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs commit -m'Regenerated from $^' $@ -endif ifeq ($(subdir),stdio-common) @@ -63,7 +60,7 @@ endif ifeq ($(subdir),login) sysdep_routines += setutxent getutxent endutxent getutxid getutxline \ - pututxline utmpxname updwtmpx getutmpx getutmp + pututxline utmpxname updwtmpx getutmpx getutmp sysdep_headers += utmpx.h bits/utmpx.h endif diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 95d7ba3800..93058ffaa2 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009 +# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009,2011 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -94,10 +94,6 @@ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \ # Make it unwritable so noone will edit it by mistake. -chmod a-w $(hurd)/bits/errno.h-tmp $(move-if-change) $(hurd)/bits/errno.h-tmp $(hurd)/bits/errno.h -ifeq ($(with-cvs),yes) - test ! -d $(hurd)/CVS || \ - (cd $(hurd) && cvs commit -m'Regenerated from $^' bits/errno.h) -endif touch $@ common-generated += errnos.d stamp-errnos diff --git a/sysdeps/sparc/sparc32/Makefile b/sysdeps/sparc/sparc32/Makefile index 6529ad897b..c5245f2a9b 100644 --- a/sysdeps/sparc/sparc32/Makefile +++ b/sysdeps/sparc/sparc32/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,2000 Free Software Foundation, Inc. +# Copyright (C) 1991-1998, 2000, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -50,8 +50,5 @@ $(divrem:%=$(sysdep_dir)/sparc/sparc32/%.S): $(sysdep_dir)/sparc/sparc32/divrem. # Make it unwritable so noone will edit it by mistake. -chmod a-w $@-tmp mv -f $@-tmp $@ -ifeq ($(with-cvs),yes) - test ! -d CVS || cvs commit -m'Regenerated from $<' $@ -endif sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/sparc32/%.S) |