Author: aurel32
Date: 2011-06-05 11:38:42 +0000 (Sun, 05 Jun 2011)
New Revision: 4713
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/linux.mk
Log:
* debian/sysdeps/linux.mk: remove obsolete comment and code about
asm-sparc64. Use the multiarch asm directory if present.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-05 11:23:38 UTC (rev
4712)
+++ glibc-package/trunk/debian/changelog 2011-06-05 11:38:42 UTC (rev
4713)
@@ -1,7 +1,10 @@
eglibc (2.13-6) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* kfreebsd/local-sysdeps.diff, update to revision 3402 (from glibc-bsd),
- to fix <sys/mount.h>. Closes: #629289.
+ to fix <sys/mount.h>. Closes: #629289.
+ * debian/sysdeps/linux.mk: remove obsolete comment and code about
+ asm-sparc64. Use the multiarch asm directory if present.
-- Aurelien Jarno <[email protected]> Sun, 05 Jun 2011 00:27:40 +0200
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2011-06-05 11:23:38 UTC (rev
4712)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2011-06-05 11:38:42 UTC (rev
4713)
@@ -13,6 +13,7 @@
else
LINUX_HEADERS := /usr/$(DEB_HOST_GNU_TYPE)/include
endif
+ LINUX_ARCH_HEADERS := /usr/include/$(DEB_HOST_MULTIARCH)
else
LINUX_HEADERS := $(LINUX_SOURCE)/include
endif
@@ -24,12 +25,13 @@
$(stamp)mkincludedir:
rm -rf debian/include
mkdir debian/include
+ if [ -d "$(LINUX_ARCH_HEADERS)" ]; then \
+ ln -s $(LINUX_ARCH_HEADERS)/asm debian/include; \
+ else ; \
+ ln -s $(LINUX_HEADERS)/asm debian/include; \
+ fi
+ ln -s $(LINUX_HEADERS)/asm-generic debian/include
ln -s $(LINUX_HEADERS)/linux debian/include
- # Link all asm directories. We can't just link asm and asm-generic
- # because of explicit references to <asm-sparc/*> and
- # <asm-sparc64/*>.
- find $(LINUX_HEADERS) -maxdepth 1 -xtype d -name asm\* \
- -exec ln -s '{}' debian/include ';'
# To make configure happy if libc6-dev is not installed.
touch debian/include/assert.h
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
