r6522 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-09-07 23:30:57 +0000 (Mon, 07 Sep 2015)
New Revision: 6522
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-bootstrap.diff
glibc-package/trunk/debian/patches/hurd-i386/local-bootstrap.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Move commited parts of hurd-i386/submitted-bootstrap.diff to cvs-bootstrap.diff
and local part to local-bootstrap.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-09-03 22:41:01 UTC (rev 6521)
+++ glibc-package/trunk/debian/changelog 2015-09-07 23:30:57 UTC (rev 6522)
@@ -18,7 +18,7 @@
really self-hosted.
* patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: Update patch to not
advertise _POSIX_CLOCK_SELECTION for vlc
- * patches/hurd-i386/submitted-bootstrap.diff: New patch to fix crt*.o build
+ * patches/hurd-i386/{local,cvs}-bootstrap.diff: New patch to fix crt*.o build
in stage1.
* rules, rules.d/build.mk: Set MIG to gnu-type alias of mig, to fix
cross-build.
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-bootstrap.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-bootstrap.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-bootstrap.diff 2015-09-07 23:30:57 UTC (rev 6522)
@@ -0,0 +1,66 @@
+commit 7f9346e11e160d0157786c1e3761453c7e0f99c4
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 6 21:07:00 2015 +0200
+
+ Fix rules generating headers in hurd/ and mach/
+
+ when initial make call has subdir= explicitly set.
+
+ * sysdeps/mach/Makefile ($(patsubst
+ mach%,m\%h%,$(mach-before-compile))): Force subdir to mach when
+ calling $(MAKE).
+ * sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
+ io fs process)): Force subdir to hurd when calling $(MAKE).
+ ($(common-objpfx)hurd/../mach/RPC_task_get_sampled_pcs.c): Force
+ subdir to mach when calling $(MAKE).
+
+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.
+
+--- a/sysdeps/mach/Makefile
++++ b/sysdeps/mach/Makefile
+@@ -42,8 +42,10 @@ mach-before-compile := $(mach-objpfx)mac
+ 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.
+- $(MAKE) -C $(..)mach mach-before-compile no_deps=t generating=t
++$(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)
+ endif
+--- a/sysdeps/mach/hurd/Makefile
++++ b/sysdeps/mach/hurd/Makefile
+@@ -46,15 +46,16 @@ 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
+- $(MAKE) -C $(..)hurd before-compile no_deps=t
++$(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
+
+ # Hurd profil.c includes this file, so give a rule to make it.
+ ifeq ($(subdir),gmon)
+ $(common-objpfx)hurd/../mach/RPC_task_get_sampled_pcs.c:
+- $(MAKE) -C $(..)mach before-compile no_deps=t
++ $(MAKE) -C $(..)mach subdir=mach before-compile no_deps=t
+ endif
+
+
Copied: glibc-package/trunk/debian/patches/hurd-i386/local-bootstrap.diff (from rev 6521, glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-bootstrap.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-bootstrap.diff 2015-09-07 23:30:57 UTC (rev 6522)
@@ -0,0 +1,15 @@
+This dependency is missing, but would pose problem on Darwin
+
+diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
+index b47cdc6..3323e81 100644
+--- a/sysdeps/mach/Makefile
++++ b/sysdeps/mach/Makefile
+@@ -35,7 +35,7 @@ endif
+ # because it's different in Darwin and the conditional crap is
+ # too much trouble. This should suffice for getting the mach/Makefile
+ # rules invoked when they need to be.
+-mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
++mach-before-compile := $(mach-objpfx)mach-shortcuts.h $(mach-objpfx)mach/mach_interface.h \
+ $(patsubst %,$(mach-objpfx)mach/mach_%.h,\
+ port host)
+
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff 2015-09-03 22:41:01 UTC (rev 6521)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff 2015-09-07 23:30:57 UTC (rev 6522)
@@ -1,42 +0,0 @@
-diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
-index b47cdc6..3323e81 100644
---- a/sysdeps/mach/Makefile
-+++ b/sysdeps/mach/Makefile
-@@ -35,7 +35,7 @@ endif
- # because it's different in Darwin and the conditional crap is
- # too much trouble. This should suffice for getting the mach/Makefile
- # rules invoked when they need to be.
--mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
-+mach-before-compile := $(mach-objpfx)mach-shortcuts.h $(mach-objpfx)mach/mach_interface.h \
- $(patsubst %,$(mach-objpfx)mach/mach_%.h,\
- port host)
-
-@@ -43,7 +43,7 @@ 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.
-- $(MAKE) -C $(..)mach mach-before-compile no_deps=t generating=t
-+ $(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t
-
- before-compile += $(mach-before-compile)
- endif
-diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
-index b528815..244ac4b 100644
---- a/sysdeps/mach/hurd/Makefile
-+++ b/sysdeps/mach/hurd/Makefile
-@@ -48,13 +48,13 @@ hurd-objpfx = $(common-objpfx)hurd/
- 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
-- $(MAKE) -C $(..)hurd before-compile no_deps=t
-+ $(MAKE) -C $(..)hurd subdir=hurd before-compile no_deps=t
- endif
-
- # Hurd profil.c includes this file, so give a rule to make it.
- ifeq ($(subdir),gmon)
- $(common-objpfx)hurd/../mach/RPC_task_get_sampled_pcs.c:
-- $(MAKE) -C $(..)mach before-compile no_deps=t
-+ $(MAKE) -C $(..)mach subdir=mach before-compile no_deps=t
- endif
-
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2015-09-03 22:41:01 UTC (rev 6521)
+++ glibc-package/trunk/debian/patches/series 2015-09-07 23:30:57 UTC (rev 6522)
@@ -163,7 +163,8 @@
hurd-i386/cvs-mlock.diff
hurd-i386/tg-mmap32th_bit.diff
hurd-i386/tg-sysheaders.diff
-hurd-i386/submitted-bootstrap.diff
+hurd-i386/cvs-bootstrap.diff
+hurd-i386/local-bootstrap.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: