Author: sthibault Date: 2015-09-03 00:25:45 +0000 (Thu, 03 Sep 2015) New Revision: 6517
Added: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-bootstrap.diff Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/patches/series Log: backport r6516 from trunk: patches/hurd-i386/submitted-bootstrap.diff: New patch to fix crt*.o build in stage1. Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-03 00:25:12 UTC (rev 6516) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-03 00:25:45 UTC (rev 6517) @@ -263,6 +263,8 @@ 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 + in stage1. -- Samuel Thibault <sthiba...@debian.org> Sun, 09 Aug 2015 20:00:16 +0000 Copied: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-bootstrap.diff (from rev 6516, glibc-package/trunk/debian/patches/hurd-i386/submitted-bootstrap.diff) =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-bootstrap.diff (rev 0) +++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-bootstrap.diff 2015-09-03 00:25:45 UTC (rev 6517) @@ -0,0 +1,42 @@ +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/branches/glibc-2.21/debian/patches/series =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/series 2015-09-03 00:25:12 UTC (rev 6516) +++ glibc-package/branches/glibc-2.21/debian/patches/series 2015-09-03 00:25:45 UTC (rev 6517) @@ -147,6 +147,7 @@ hurd-i386/cvs-mlock.diff hurd-i386/tg-mmap32th_bit.diff hurd-i386/tg-sysheaders.diff +hurd-i386/submitted-bootstrap.diff i386/local-biarch.diff i386/local-cmov.diff