This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.22-218-g697ed91


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  697ed91ca901f8e2ce3ba2b7cf69cdb18c8b37ad (commit)
      from  7f9346e11e160d0157786c1e3761453c7e0f99c4 (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=697ed91ca901f8e2ce3ba2b7cf69cdb18c8b37ad

commit 697ed91ca901f8e2ce3ba2b7cf69cdb18c8b37ad
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Tue Sep 8 01:26:01 2015 +0200

    Fix parallel build of before-compile targets.
    
    * sysdeps/mach/Makefile ($(patsubst
    mach%,m\%h%,$(mach-before-compile))): Move rule to dedicated
    mach-before-compile target.
    * sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
    io fs process)): Move rule to dedicated hurd-before-compile target.

diff --git a/ChangeLog b/ChangeLog
index 32f3201..7316777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-09-08  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	Fix parallel build of before-compile targets.
+
+	* sysdeps/mach/Makefile ($(patsubst
+	mach%,m\%h%,$(mach-before-compile))): Move rule to dedicated
+	mach-before-compile target.
+	* sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
+	io fs process)): Move rule to dedicated hurd-before-compile target.
+
 2015-09-06  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	Fix rules generating headers in hurd/ and mach/ when initial make call
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index 3323e81..c6f44fe 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -42,7 +42,9 @@ mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
 ifneq (mach,$(subdir))
 # This patsubst generates patterns like `m%h-shortcuts.h', which are damn
 # likely to match just the corresponding particular file we want.
-$(patsubst mach%,m\%h%,$(mach-before-compile)): # Run only if doesn't exist.
+$(patsubst mach%,m\%h%,$(mach-before-compile)): mach-before-compile # Run only if doesn't exist.
+.PHONY: mach-before-compile
+mach-before-compile:
 	$(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t
 
 before-compile += $(mach-before-compile)
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 244ac4b..d8db400 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -46,8 +46,9 @@ hurd-objpfx = $(common-objpfx)hurd/
 
 # These are all the generated headers that <hurd.h> includes.
 before-compile += $(patsubst %,$(hurd-objpfx)hurd/%.h,auth io fs process)
-$(patsubst %,$(hurd-objpfx)hurd/%.%,auth io fs process): \
-  $(common-objpfx)mach/mach-shortcuts.h
+$(patsubst %,$(hurd-objpfx)hurd/%.%,auth io fs process): hurd-before-compile \
+.PHONY: hurd-before-compile
+hurd-before-compile: $(common-objpfx)mach/mach-shortcuts.h
 	$(MAKE) -C $(..)hurd subdir=hurd before-compile no_deps=t
 endif
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   10 ++++++++++
 sysdeps/mach/Makefile      |    4 +++-
 sysdeps/mach/hurd/Makefile |    5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]