r6489 - in glibc-package/trunk/debian: . patches/hurd-i386 sysdeps
Author: sthibault
Date: 2015-08-28 08:23:33 +0000 (Fri, 28 Aug 2015)
New Revision: 6489
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/libpthread_build.diff
glibc-package/trunk/debian/sysdeps/hurd.mk
Log:
Fix header inclusion for cross-build
which happens to clean the build process by not using system headers.
* patches/hurd-i386/libpthread_build.diff: Fix header inclusion to get
pthread headers from libpthread/ instead of system.
* sysdeps/hurd.mk: Create symlinks to kernel and hurd headers required for
build, so that we can pass --with-headers to configure to make the build
really self-hosted.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-08-28 01:11:29 UTC (rev 6488)
+++ glibc-package/trunk/debian/changelog 2015-08-28 08:23:33 UTC (rev 6489)
@@ -10,6 +10,11 @@
code getting in the way for stage1.
* patches/hurd-i386/cvs-libpthread_build.diff: New patch to fix build of
generic libpthread code.
+ * patches/hurd-i386/libpthread_build.diff: Fix header inclusion to get
+ pthread headers from libpthread/ instead of system.
+ * sysdeps/hurd.mk: Create symlinks to kernel and hurd headers required for
+ build, so that we can pass --with-headers to configure to make the build
+ really self-hosted.
-- Samuel Thibault <sthibault@debian.org> Sun, 09 Aug 2015 20:00:16 +0000
Modified: glibc-package/trunk/debian/patches/hurd-i386/libpthread_build.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/libpthread_build.diff 2015-08-28 01:11:29 UTC (rev 6488)
+++ glibc-package/trunk/debian/patches/hurd-i386/libpthread_build.diff 2015-08-28 08:23:33 UTC (rev 6489)
@@ -3,3 +3,11 @@
@@ -0,0 +1,2 @@
+libc_add_on_canonical=libpthread
+libc_add_on_subdirs=.
+--- a/sysdeps/mach/hurd/Implies.orig 2015-08-20 21:22:34.000000000 +0000
++++ b/sysdeps/mach/hurd/Implies 2015-08-20 21:22:48.000000000 +0000
+@@ -3,3 +3,5 @@
+ gnu
+ # The Hurd provides a rough superset of the functionality of 4.4 BSD.
+ unix/bsd
++# libpthread provides generic bits
++../libpthread/sysdeps/generic
Modified: glibc-package/trunk/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd.mk 2015-08-28 01:11:29 UTC (rev 6488)
+++ glibc-package/trunk/debian/sysdeps/hurd.mk 2015-08-28 08:23:33 UTC (rev 6489)
@@ -9,6 +9,33 @@
libc_add-ons = libpthread $(add-ons)
libc_extra_config_options := $(extra_config_options)
+ifndef HURD_SOURCE
+ HURD_HEADERS := /usr/include
+else
+ HURD_HEADERS := $(HURD_SOURCE)/include
+endif
+
+# Minimum Kernel supported
+with_headers = --with-headers=$(shell pwd)/debian/include
+
+KERNEL_HEADER_DIR = $(stamp)mkincludedir
+$(stamp)mkincludedir:
+ rm -rf debian/include
+ mkdir debian/include
+
+ # System headers
+ for path in hurd mach mach_debug device cthreads.h; do \
+ ln -s $(HURD_HEADERS)/$$path debian/include ; \
+ done
+
+ # To make configure happy if libc0.3-dev is not installed.
+ touch debian/include/assert.h
+
+ touch $@
+
+# Also to make configure happy.
+export CPPFLAGS = -isystem $(shell pwd)/debian/include
+
# Glibc should really do this for us.
define libc_extra_install
mkdir -p debian/tmp-$(curpass)/lib
Reply to: