r6146 - in glibc-package/branches/glibc-2.19/debian: . patches patches/any
Author: aurel32
Date: 2014-06-11 21:37:33 +0000 (Wed, 11 Jun 2014)
New Revision: 6146
Added:
glibc-package/branches/glibc-2.19/debian/patches/any/local-bootstrap-headers.diff
Modified:
glibc-package/branches/glibc-2.19/debian/changelog
glibc-package/branches/glibc-2.19/debian/patches/series
Log:
patches/any/local-bootstrap-headers.diff: new patch from eglibc tree
to ease header installation when bootstrapping.
Modified: glibc-package/branches/glibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.19/debian/changelog 2014-06-11 20:44:58 UTC (rev 6145)
+++ glibc-package/branches/glibc-2.19/debian/changelog 2014-06-11 21:37:33 UTC (rev 6146)
@@ -25,6 +25,8 @@
export the ___fpscr_values symbol on SH4.
- patches/any/local-libpic.diff: new patch from eglibc tree to install
*_pic.a files.
+ - patches/any/local-bootstrap-headers.diff: new patch from eglibc tree
+ to ease header installation when bootstrapping.
- kfreebsd/local-fbtl.diff: update to revision 5485 (from glibc-bsd) to
remove EGLIBC specific code.
Added: glibc-package/branches/glibc-2.19/debian/patches/any/local-bootstrap-headers.diff
===================================================================
--- glibc-package/branches/glibc-2.19/debian/patches/any/local-bootstrap-headers.diff (rev 0)
+++ glibc-package/branches/glibc-2.19/debian/patches/any/local-bootstrap-headers.diff 2014-06-11 21:37:33 UTC (rev 6146)
@@ -0,0 +1,80 @@
+Taken from EGLIBC, r1484 + r1525
+
+2007-02-20 Jim Blandy <jimb@codesourcery.com>
+
+ * Makefile (install-headers): Preserve old behavior: depend on
+ $(inst_includedir)/gnu/stubs.h only if install-bootstrap-headers
+ is set; otherwise, place gnu/stubs.h on the 'install-others' list.
+
+2007-02-16 Jim Blandy <jimb@codesourcery.com>
+
+ * Makefile: Amend make install-headers to install everything
+ necessary for building a cross-compiler. Install gnu/stubs.h as
+ part of 'install-headers', not 'install-others'.
+ If install-bootstrap-headers is 'yes', install a dummy copy of
+ gnu/stubs.h, instead of computing the real thing.
+ * include/stubs-bootstrap.h: New file.
+
+
+--- /dev/null
++++ b/include/stubs-bootstrap.h
+@@ -0,0 +1,12 @@
++/* Placeholder stubs.h file for bootstrapping.
++
++ When bootstrapping a GCC/GLIBC pair, GCC requires that the GLIBC
++ headers be installed, but we can't fully build EGLIBC without that
++ GCC. So we run the command:
++
++ make install-headers install-bootstrap-headers=yes
++
++ to install the headers GCC needs, but avoid building certain
++ difficult headers. The <gnu/stubs.h> header depends, via the
++ GLIBC subdir 'stubs' make targets, on every .o file in GLIBC, but
++ an empty stubs.h like this will do fine for GCC. */
+--- a/Makefile
++++ b/Makefile
+@@ -68,9 +68,18 @@
+ vpath %.h $(subdir-dirs)
+
+ # What to install.
+-install-others = $(inst_includedir)/gnu/stubs.h
+ install-bin-script =
+
++# If we're bootstrapping, install a dummy gnu/stubs.h along with the
++# other headers, so 'make install-headers' produces a useable include
++# tree. Otherwise, install gnu/stubs.h later, after the rest of the
++# build is done.
++ifeq ($(install-bootstrap-headers),yes)
++install-headers: $(inst_includedir)/gnu/stubs.h
++else
++install-others = $(inst_includedir)/gnu/stubs.h
++endif
++
+ ifeq (yes,$(build-shared))
+ headers += gnu/lib-names.h
+ endif
+@@ -150,6 +159,16 @@
+
+ subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
+
++# gnu/stubs.h depends (via the subdir 'stubs' targets) on all the .o
++# files in EGLIBC. For bootstrapping a GCC/EGLIBC pair, an empty
++# gnu/stubs.h is good enough.
++ifeq ($(install-bootstrap-headers),yes)
++$(inst_includedir)/gnu/stubs.h: include/stubs-bootstrap.h $(+force)
++ $(make-target-directory)
++ $(INSTALL_DATA) $< $@
++
++installed-stubs =
++else
+ ifndef abi-variants
+ installed-stubs = $(inst_includedir)/gnu/stubs.h
+ else
+@@ -176,6 +195,7 @@
+
+ install-others-nosubdir: $(installed-stubs)
+ endif
++endif
+
+
+ # Since stubs.h is never needed when building the library, we simplify the
Modified: glibc-package/branches/glibc-2.19/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.19/debian/patches/series 2014-06-11 20:44:58 UTC (rev 6145)
+++ glibc-package/branches/glibc-2.19/debian/patches/series 2014-06-11 21:37:33 UTC (rev 6146)
@@ -246,5 +246,6 @@
any/cvs-strtod.diff
any/local-dynamic-resolvconf.diff
any/local-libpic.diff
+any/local-bootstrap-headers.diff
any/cvs-resolv-reuse-fd.diff
any/submitted-argp-attribute.diff
Reply to: