r4856 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2011-08-08 08:48:44 +0000 (Mon, 08 Aug 2011)
New Revision: 4856
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
* Install x86-64 headers on i386 instead of the i386 ones. Closes:
#637000.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-08 08:46:51 UTC (rev 4855)
+++ glibc-package/trunk/debian/changelog 2011-08-08 08:48:44 UTC (rev 4856)
@@ -4,6 +4,8 @@
* Add testsuite results for s390x.
* Install x86-64 version of ldd in libc-bin:i386. Closes: #636947.
* Add a Breaks: perl (<< 5.12.4-2) to libc0.1/6/6.1. Closes: #636686.
+ * Install x86-64 headers on i386 instead of the i386 ones. Closes:
+ #637000.
-- Aurelien Jarno <aurel32@debian.org> Fri, 05 Aug 2011 07:46:28 +0200
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2011-08-08 08:46:51 UTC (rev 4855)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-08-08 08:48:44 UTC (rev 4856)
@@ -49,6 +49,9 @@
define amd64_extra_install
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
Reply to: