This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-512-g8886609
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 23 Oct 2012 22:05:48 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-512-g8886609
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 88866099db3973a1b4d3bb0fb3f45efea067e4e8 (commit)
from b4b4c2968ece5f95bffa6893b5d5b50e966ed40f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=88866099db3973a1b4d3bb0fb3f45efea067e4e8
commit 88866099db3973a1b4d3bb0fb3f45efea067e4e8
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Oct 23 22:05:28 2012 +0000
Refactor parts of run-program-prefix and built-program-cmd into new run-via-rtld-prefix.
diff --git a/ChangeLog b/ChangeLog
index a3a6d34..19791f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-23 Joseph Myers <joseph@codesourcery.com>
+ Jim Blandy <jimb@codesourcery.com>
+
+ * Makeconfig (run-via-rtld-prefix): New variable.
+ (run-program-prefix): Define in terms of $(run-via-rtld-prefix).
+ (built-program-cmd): Likewise.
+
2012-10-22 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/bits/fcntl-linux.h (O_RSYNC): Define to
diff --git a/Makeconfig b/Makeconfig
index 9dadc3f..0a78b76 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -573,17 +573,30 @@ sysdep-library-path = \
$(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
$(filter -Wl$(comma)-rpath-link=%,\
$(sysdep-LDFLAGS)))))
-run-program-prefix = $(if $(filter $(notdir $(built-program-file)),\
- $(tests-static) $(xtests-static)),, \
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)))
+# $(run-via-rtld-prefix) is a command that, when prepended to the name
+# of a program built with the newly built library, produces a command
+# that, executed on the host for which the library is built, runs that
+# program. For the statically-linked %-bp test programs, and for
+# tests listed in tests-static or xtests-static, it is empty.
+run-via-rtld-prefix = \
+ $(if $(strip $(filter $(notdir $(built-program-file)), \
+ $(tests-static) $(xtests-static)) \
+ $(filter %-bp,$(built-program-file))),, \
+ $(elf-objpfx)$(rtld-installed-name) \
+ --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)))
else
-run-program-prefix =
-endif
-# Never use $(run-program-prefix) for the statically-linked %-bp test programs
-built-program-cmd = $(patsubst %,$(run-program-prefix),\
- $(filter-out %-bp,$(built-program-file))) \
- $(built-program-file)
+run-via-rtld-prefix =
+endif
+# $(run-via-rtld-prefix) is a command that, when prepended to the name
+# of a program built with the newly built library, produces a command
+# that, executed on the build system on which "make" is run, runs that
+# program.
+run-program-prefix = $(run-via-rtld-prefix)
+# $(built-program-cmd) is a command that, executed on the build system
+# on which "make" is run, runs the newly built program that is the
+# second dependency of the makefile target in which
+# $(built-program-cmd) is used.
+built-program-cmd = $(run-via-rtld-prefix) $(built-program-file)
ifndef LD
LD := ld -X
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
Makeconfig | 33 +++++++++++++++++++++++----------
2 files changed, 30 insertions(+), 10 deletions(-)
hooks/post-receive
--
GNU C Library master sources