r4860 - in glibc-package/trunk/debian: . debhelper.in sysdeps
Author: aurel32
Date: 2011-08-08 21:18:28 +0000 (Mon, 08 Aug 2011)
New Revision: 4860
Added:
glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst.i386
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
* On i386, install i386 specific headers in the multiarch include
path, the common and the x86-64 ones in the default include path.
Closes: #637141.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-08 14:53:11 UTC (rev 4859)
+++ glibc-package/trunk/debian/changelog 2011-08-08 21:18:28 UTC (rev 4860)
@@ -1,3 +1,13 @@
+eglibc (2.13-16) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * The "multiarch starts to piss me off" upload.
+ * On i386, install i386 specific headers in the multiarch include
+ path, the common and the x86-64 ones in the default include path.
+ Closes: #637141.
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 08 Aug 2011 21:52:47 +0200
+
eglibc (2.13-15) unstable; urgency=low
[ Aurelien Jarno ]
Added: glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst.i386
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst.i386 (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst.i386 2011-08-08 21:18:28 UTC (rev 4860)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ (upgrade|install)
+ # We want /usr/include/{bits,fpu_control.h,gnu,sys} to become
+ # directories or files instead of symlinks.
+ for dir in bits fpu_control.h gnu sys ; do
+ if test -h /usr/include/$dir ; then
+ rm -rf /usr/include/$dir
+ fi
+ done
+ ;;
+ (*)
+ ;;
+esac
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2011-08-08 14:53:11 UTC (rev 4859)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-08-08 21:18:28 UTC (rev 4860)
@@ -49,9 +49,6 @@
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
@@ -61,20 +58,13 @@
endef
define libc6-dev-amd64_extra_pkg_install
-
mkdir -p debian/libc6-dev-amd64/usr/include
-ln -s i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/
-ln -s i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/
-ln -s i386-linux-gnu/fpu_control.h debian/libc6-dev-amd64/usr/include/
-
-mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
-cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h \
- debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
-
-mkdir -p debian/libc6-dev-amd64/usr/include/sys
-for i in `ls debian/tmp-libc/usr/include/i386-linux-gnu/sys` ; do \
- ln -s ../i386-linux-gnu/sys/$$i debian/libc6-dev-amd64/usr/include/sys/$$i ; \
-done
-
+cp -a debian/tmp-amd64/usr/include/bits \
+ debian/libc6-dev-amd64/usr/include/
+cp -a debian/tmp-amd64/usr/include/gnu \
+ debian/libc6-dev-amd64/usr/include/
+cp -a debian/tmp-amd64/usr/include/sys \
+ debian/libc6-dev-amd64/usr/include/
+cp debian/tmp-amd64/usr/include/fpu_control.h \
+ debian/libc6-dev-amd64/usr/include/
endef
-
Reply to: