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.19-765-g3885132
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Jul 2014 01:52:59 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-765-g3885132
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 38851324d820b7cf8b8e9694e7c33325c16f38db (commit)
from 69862e2511a41d64ff8ce942721589fb12bade15 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=38851324d820b7cf8b8e9694e7c33325c16f38db
commit 38851324d820b7cf8b8e9694e7c33325c16f38db
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu Jul 3 18:52:51 2014 -0700
Restore subdir conditional for tst-timer dependency.
diff --git a/ChangeLog b/ChangeLog
index 5eb0d43..0a8688a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-03 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/pthread/Makefile: Conditionalize tst-timer bits (the only
+ thing) with "ifeq ($(subdir),rt)".
+
2014-07-03 Richard Henderson <rth@redhat.com>
* sysdeps/alpha/fpu/s_nearbyintf.c: Remove file.
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 1080dc9..47e61bd 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -16,8 +16,12 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+ifeq ($(subdir),rt)
+
ifeq (yes,$(build-shared))
$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
else
$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
endif
+
+endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/pthread/Makefile | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources