about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-03-14 16:05:10 -0700
committerRoland McGrath <roland@hack.frob.com>2014-03-14 16:05:31 -0700
commit5006148ee57c80a787b275c04587678e9fe0a3f3 (patch)
treee0defd7ca4dbe51a138d631abd29d70c7001503b
parentd6fe5e582d4e4bb339f55bc6369eaca0c52e527c (diff)
downloadglibc-5006148ee57c80a787b275c04587678e9fe0a3f3.tar.gz
glibc-5006148ee57c80a787b275c04587678e9fe0a3f3.tar.xz
glibc-5006148ee57c80a787b275c04587678e9fe0a3f3.zip
Remove "Compiled on ..." crapola from version text.
-rw-r--r--ChangeLog5
-rw-r--r--csu/Makefile35
2 files changed, 6 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index fb61ad2e91..d0011133d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-14  Roland McGrath  <roland@hack.frob.com>
+
+	* csu/Makefile ($(objpfx)version-info.h): Remove linux-specific
+	"Compiled on ..." crapola.  It is anti-useful.
+
 2014-03-14  Joseph Myers  <joseph@codesourcery.com>
 
 	* scripts/evaluate-test.sh: Handle fourth argument to determine
diff --git a/csu/Makefile b/csu/Makefile
index 5252361ec4..311dbb03d7 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -131,40 +131,7 @@ all-Banner-files = $(wildcard $(addsuffix /Banner,\
 						 $(sysdeps-srcdirs))))
 $(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
 	$(make-target-directory)
-	(case $(config-os) in \
-	   linux*) version=`(printf '%s\n%s\n' \
-				    '#include <linux/version.h>' \
-				    UTS_RELEASE \
-			     | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 | \
-			     sed -e 's/"\([^"]*\)".*/\1/p' -e d) 2>/dev/null`;\
-		   if [ -z "$$version" ]; then \
-		     version=`(printf '%s\n%s\n' \
-				      '#include <linux/version.h>' \
-				       LINUX_VERSION_CODE \
-			       | $(CC) $(CPPFLAGS) -O -E -P - -DNOT_IN_libc=1 \
-			       | sed -n -e '/^[123456789].*/p' \
-			       | awk '{v=$$1; \
-				       printf("%d.%d.%d\n", \
-					      v/65535, v/256%256, v%256)}') \
-				2>/dev/null`; \
-		   fi; \
-		   if [ -z "$$version" ]; then \
-		     if [ -r /proc/version ]; then \
-		       version=`sed 's/.*Linux version \([^ ]*\) .*/>>\1<</' \
-				< /proc/version`; \
-		     else \
-		       version=`uname -r`; \
-		     fi; \
-		   fi; \
-		   os=`uname -s 2> /dev/null`; \
-		   if [ -z "$$os" ]; then \
-		     os=Linux; \
-		   fi; \
-		   printf '"Compiled on a %s %s system on %s.\\n"\n' \
-			  "$$os" "$$version" "`date +%Y-%m-%d`";; \
-	   *) ;; \
-	 esac; \
-	 files="$(all-Banner-files)";				\
+	(files="$(all-Banner-files)";				\
 	 if test -n "$$files"; then				\
 	   printf '"Available extensions:\\n"\n';		\
 	   sed -e '/^#/d' -e 's/^[[:space:]]*/	/'		\