diff mbox

Remove Banner mechanism

Message ID alpine.DEB.2.20.1709221714410.17667@digraph.polyomino.org.uk
State New, archived
Headers

Commit Message

Joseph Myers Sept. 22, 2017, 5:15 p.m. UTC 
  This patch removes the Banner mechanism, with the last remaining
Banner file replaced by a contrib.texi entry.  This accords with the
principle that the output of running libc.so.6 is not the place to
credit particular contributions (the manual is), and with all other
configuration options not mentioned there, it doesn't seem appropriate
to focus there on the one question of whether the one remaining piece
configured as an add-on was enabled or not.

Tested for x86_64.

2017-09-22  Joseph Myers  <joseph@codesourcery.com>

	* csu/Makefile (generated): Do not add version-info.h.
	(before-compile): Likewise.
	(all-Banner-files): Remove variable.
	($(objpfx)version-info.h): Remove rule.
	* csu/version.c (banner): Do not include "version-info.h".
	* libidn/Banner: Remove.
	* manual/contrib.texi (Simon Josefsson): New entry.

Comments

Carlos O'Donell Sept. 22, 2017, 5:28 p.m. UTC | #1 
On Sep 22, 2017 11:15, "Joseph Myers" <joseph@codesourcery.com> wrote:

This patch removes the Banner mechanism, with the last remaining
Banner file replaced by a contrib.texi entry.  This accords with the
principle that the output of running libc.so.6 is not the place to
credit particular contributions (the manual is), and with all other
configuration options not mentioned there, it doesn't seem appropriate
to focus there on the one question of whether the one remaining piece
configured as an add-on was enabled or not.

Tested for x86_64.

2017-09-22  Joseph Myers  <joseph@codesourcery.com>

        * csu/Makefile (generated): Do not add version-info.h.
        (before-compile): Likewise.
        (all-Banner-files): Remove variable.
        ($(objpfx)version-info.h): Remove rule.
        * csu/version.c (banner): Do not include "version-info.h".
        * libidn/Banner: Remove.
        * manual/contrib.texi (Simon Josefsson): New entry.


Reviewed-by: Carlos O'Donell <carlos@redhat.com>

Lools good to me.

c.
diff mbox

Patch

diff --git a/csu/Makefile b/csu/Makefile
index 490d0b0..fd668a5 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -39,8 +39,6 @@  omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 			     b$(start-installed-name) $(csu-dummies) \
 			     S$(start-installed-name))
 install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
-generated += version-info.h
-before-compile += $(objpfx)version-info.h
 
 # No tests are allowed in the csu/ subdirectory because the startup
 # code is compiled with special flags.
@@ -149,16 +147,3 @@  $(objpfx)abi-tag.h: $(..)abi-tags
 	done
 	if test -r $@.new; then mv -f $@.new $@; \
 	else echo >&2 'This configuration not matched in $<'; exit 1; fi
-
-all-Banner-files = $(wildcard $(addsuffix /Banner,\
-					  $(sort $(subdir-srcdirs) \
-						 $(sysdeps-srcdirs))))
-$(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
-	$(make-target-directory)
-	(files="$(all-Banner-files)";				\
-	 if test -n "$$files"; then				\
-	   printf '"Available extensions:\\n"\n';		\
-	   sed -e '/^#/d' -e 's/^[[:space:]]*/	/'		\
-	       -e 's/^\(.*\)$$/\"\1\\n\"/' $$files;		\
-	 fi) > $@T
-	mv -f $@T $@
diff --git a/csu/version.c b/csu/version.c
index f3992ab..8e86d49 100644
--- a/csu/version.c
+++ b/csu/version.c
@@ -30,7 +30,6 @@  This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n\
 Compiled by GNU CC version "__VERSION__".\n"
-#include "version-info.h"
 #ifdef LIBC_ABIS_STRING
 LIBC_ABIS_STRING
 #endif
diff --git a/libidn/Banner b/libidn/Banner
deleted file mode 100644
index c31e757..0000000
--- a/libidn/Banner
+++ /dev/null
@@ -1 +0,0 @@ 
-GNU Libidn by Simon Josefsson
diff --git a/manual/contrib.texi b/manual/contrib.texi
index 62798b0..fbf42db 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -176,6 +176,9 @@  software floating-point support and for
 his direction as part of @theglibc{} steering committee.
 
 @item
+Simon Josefsson for the @code{libidn} add-on.
+
+@item
 Geoffrey Keating for the port to Linux on PowerPC
 (@code{powerpc-@var{anything}-linux}).