r2536 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2007-09-09 11:07:38 +0000 (Sun, 09 Sep 2007)
New Revision: 2536
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
* sysdeps/i386.mk: uses x86_64 headers also for the main flavour.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-09-07 08:22:29 UTC (rev 2535)
+++ glibc-package/trunk/debian/changelog 2007-09-09 11:07:38 UTC (rev 2536)
@@ -2,8 +2,9 @@
* sysdeps/amd64.mk: uses x86_64 headers also for the i486 flavour now
that they are compatible.
+ * sysdeps/i386.mk: uses x86_64 headers also for the main flavour.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 7 Sep 2007 10:21:30 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 9 Sep 2007 13:06:58 +0200
glibc (2.6.1-2) unstable; urgency=low
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2007-09-07 08:22:29 UTC (rev 2535)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2007-09-09 11:07:38 UTC (rev 2536)
@@ -45,12 +45,15 @@
amd64_CXX = $(CXX) -m64 -D__x86_64__
amd64_extra_cflags = -O3 -g
amd64_extra_config_options = $(extra_config_options) --disable-profile
-amd64_includedir = /usr/include/x86_64-linux-gnu
amd64_slibdir = /lib64
amd64_libdir = /usr/lib64
define amd64_extra_install
-cp debian/tmp-amd64/usr/bin/ldd debian/tmp-libc/usr/bin
+cp debian/tmp-amd64/usr/bin/ldd \
+ debian/tmp-libc/usr/bin
+cp -af debian/tmp-amd64/usr/include/* \
+ debian/tmp-libc/usr/include
+rm -f debian/tmp-libc/usr/include/gnu/stubs-64.h
endef
define libc6-dev_extra_pkg_install
@@ -60,7 +63,9 @@
endef
define libc6-dev-amd64_extra_pkg_install
-mkdir -p debian/libc6-dev-amd64/usr/include
-cp -af debian/tmp-amd64/usr/include/x86_64-linux-gnu \
- debian/libc6-dev-amd64/usr/include
+mkdir -p debian/libc6-dev-amd64/usr/include/gnu
+cp -af debian/tmp-amd64/usr/include/gnu/stubs-64.h \
+ debian/libc6-dev-amd64/usr/include/gnu
+ln -sf . debian/libc6-dev-amd64/usr/include/x86_64-linux-gnu
endef
+
Reply to: