r1889 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/sysdeps trunk/debian trunk/debian/sysdeps
Author: aurel32
Date: 2007-01-02 03:16:47 +0100 (Tue, 02 Jan 2007)
New Revision: 1889
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/kfreebsd.mk
Log:
* sysdeps/kfreebsd.mk: Link all machine*/ directories to support
new bi-arch headers
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-12-07 11:29:51 UTC (rev 1888)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-01-02 02:16:47 UTC (rev 1889)
@@ -232,6 +232,13 @@
-- Clint Adams <schizo@debian.org> Sun, 28 May 2006 03:28:14 +0200
+glibc (2.3.6.ds1-10) UNRELEASED; urgency=low
+
+ * sysdeps/kfreebsd.mk: Link all machine*/ directories to support
+ new bi-arch headers.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 2 Jan 2007 03:13:54 +0100
+
glibc (2.3.6.ds1-9) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd.mk 2006-12-07 11:29:51 UTC (rev 1888)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd.mk 2007-01-02 02:16:47 UTC (rev 1889)
@@ -4,7 +4,7 @@
# Linuxthreads Config
threads = yes
-libc_add-ons = ports linuxthreads $(add-ons)
+libc_add-ons = linuxthreads $(add-ons)
libc_extra_config_options = $(extra_config_options) --disable-compatible-utmp
ifndef KFREEBSD_SOURCE
@@ -24,7 +24,6 @@
$(stamp)mkincludedir:
rm -rf debian/include
mkdir debian/include
- ln -s $(KFREEBSD_HEADERS)/machine debian/include
ln -s $(KFREEBSD_HEADERS)/net debian/include
ln -s $(KFREEBSD_HEADERS)/netatalk debian/include
ln -s $(KFREEBSD_HEADERS)/netipx debian/include
@@ -33,6 +32,12 @@
ln -s $(KFREEBSD_HEADERS)/sys debian/include
ln -s $(KFREEBSD_HEADERS)/vm debian/include
+ # Link all machine directories. We can't just link machine
+ # because of explicit references to <machine-amd64/*> and
+ # <machine-i386/*>.
+ find $(KFREEBSD_HEADERS) -maxdepth 1 -xtype d -name machine\* \
+ -exec ln -s '{}' debian/include ';'
+
# To make configure happy if libc0.1-dev is not installed.
touch debian/include/assert.h
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-12-07 11:29:51 UTC (rev 1888)
+++ glibc-package/trunk/debian/changelog 2007-01-02 02:16:47 UTC (rev 1889)
@@ -1,3 +1,10 @@
+glibc (2.3.6.ds1-10) UNRELEASED; urgency=low
+
+ * sysdeps/kfreebsd.mk: Link all machine*/ directories to support
+ new bi-arch headers.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 2 Jan 2007 03:13:54 +0100
+
glibc (2.3.6.ds1-9) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-12-07 11:29:51 UTC (rev 1888)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2007-01-02 02:16:47 UTC (rev 1889)
@@ -24,7 +24,6 @@
$(stamp)mkincludedir:
rm -rf debian/include
mkdir debian/include
- ln -s $(KFREEBSD_HEADERS)/machine debian/include
ln -s $(KFREEBSD_HEADERS)/net debian/include
ln -s $(KFREEBSD_HEADERS)/netatalk debian/include
ln -s $(KFREEBSD_HEADERS)/netipx debian/include
@@ -33,6 +32,12 @@
ln -s $(KFREEBSD_HEADERS)/sys debian/include
ln -s $(KFREEBSD_HEADERS)/vm debian/include
+ # Link all machine directories. We can't just link machine
+ # because of explicit references to <machine-amd64/*> and
+ # <machine-i386/*>.
+ find $(KFREEBSD_HEADERS) -maxdepth 1 -xtype d -name machine\* \
+ -exec ln -s '{}' debian/include ';'
+
# To make configure happy if libc0.1-dev is not installed.
touch debian/include/assert.h
Reply to: