r4828 - in glibc-package/trunk/debian: . debhelper.in sysdeps
Author: aurel32
Date: 2011-07-30 11:30:11 +0000 (Sat, 30 Jul 2011)
New Revision: 4828
Added:
glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/ppc64.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/s390x.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* Change include directory on i386 from i486-linux-gnu to i386-linux-gnu
and on kfreebsd-i386 from i486-kfreebsd-gnu to i386-kfreebsd-gnu.
* Fix installation of biarch headers (Closes: #635685):
- Use a symlink for bits/ and gnu/ directories
- Use symlinked files for sys/ directory
- Add a preinst script to do the directory <-> symlink conversion.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/changelog 2011-07-30 11:30:11 UTC (rev 4828)
@@ -2,8 +2,14 @@
[ Aurelien Jarno ]
* rules.d/debhelper.mk: Fix a typo about kfreebsd-amd64.
+ * Change include directory on i386 from i486-linux-gnu to i386-linux-gnu
+ and on kfreebsd-i386 from i486-kfreebsd-gnu to i386-kfreebsd-gnu.
+ * Fix installation of biarch headers (Closes: #635685):
+ - Use a symlink for bits/ and gnu/ directories
+ - Use symlinked files for sys/ directory
+ - Add a preinst script to do the directory <-> symlink conversion.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 26 Jul 2011 16:04:27 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 30 Jul 2011 13:30:02 +0200
eglibc (2.13-11) unstable; urgency=low
Added: glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev-alt.preinst 2011-07-30 11:30:11 UTC (rev 4828)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+ (upgrade|install)
+ # We want /usr/include/bits and /usr/include/gnu to become
+ # symlinks
+ if test -d /usr/include/bits ; then
+ rm -rf /usr/include/bits
+ fi
+ if test -d /usr/include/gnu ; then
+ rm -rf /usr/include/gnu
+ fi
+
+ # We want /usr/include/sys to be a normal directory instead
+ # of a symlink
+ if test -h /usr/include/sys ; then
+ rm -f /usr/include/sys
+ fi
+ ;;
+ (*)
+ ;;
+esac
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -26,18 +26,30 @@
i386_CXX = $(CC) -m32
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
-i386_includedir = /usr/include/i486-linux-gnu
+i386_includedir = /usr/include/i386-linux-gnu
i386_slibdir = /lib32
i386_libdir = /usr/lib32
define libc6-dev-i386_extra_pkg_install
+
+mkdir -p debian/libc6-dev-i386/usr/include/i386-linux-gnu
+ln -s x86_64-linux-gnu/bits debian/libc6-dev-i386/usr/include/
+ln -s x86_64-linux-gnu/gnu debian/libc6-dev-i386/usr/include/
+
mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
-cp -af debian/tmp-i386/usr/include/i486-linux-gnu/gnu/stubs-32.h \
- debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu/
-ln -s x86_64-linux-gnu/gnu debian/libc6-dev-i386/usr/include/gnu
-ln -s x86_64-linux-gnu/sys debian/libc6-dev-i386/usr/include/sys
-ln -s x86_64-linux-gnu/bits debian/libc6-dev-i386/usr/include/bits
-mkdir -p debian/libc6-dev-i386/usr/include/i486-linux-gnu
+cp -a debian/tmp-i386/usr/include/i386-linux-gnu/gnu/stubs-32.h \
+ debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
+
+mkdir -p debian/libc6-dev-i386/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/x86_64-linux-gnu/sys` ; do \
+ ln -s ../x86_64-linux-gnu/sys/$$i debian/libc6-dev-i386/usr/include/sys/$$i ; \
+done
+
+cp -a debian/tmp-i386/usr/include/i386-linux-gnu/sys/elf.h \
+ debian/libc6-dev-i386/usr/include/sys
+cp -a debian/tmp-i386/usr/include/i386-linux-gnu/sys/vm86.h \
+ debian/libc6-dev-i386/usr/include/sys
+
endef
define libc6-i386_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -61,12 +61,19 @@
endef
define libc6-dev-amd64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnu
+ln -s i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/
+ln -s i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/
+
mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
-cp -af debian/tmp-amd64/usr/include/gnu/stubs-64.h \
+cp -a debian/tmp-amd64/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
-ln -s i386-linux-gnu/gnu debian/libc6-dev-amd64/usr/include/gnu
-ln -s i386-linux-gnu/sys debian/libc6-dev-amd64/usr/include/sys
-ln -s i386-linux-gnu/bits debian/libc6-dev-amd64/usr/include/bits
-mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-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
+
endef
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -18,18 +18,28 @@
i386_add-ons = ports linuxthreads $(add-ons)
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
-i386_includedir = /usr/include/i486-kfreebsd-gnu
+i386_includedir = /usr/include/i386-kfreebsd-gnu
i386_slibdir = /lib32
i386_libdir = /usr/lib32
define libc0.1-dev-i386_extra_pkg_install
-mkdir -p debian/libc0.1-dev-i386/usr/include/gnu
-cp -af debian/tmp-i386/usr/include/i486-kfreebsd-gnu/gnu/stubs-32.h \
- debian/libc0.1-dev-i386/usr/include/gnu
-mkdir -p debian/libc0.1-dev-i386/usr/include/sys
-cp -af debian/tmp-i386/usr/include/i486-kfreebsd-gnu/sys/vm86.h \
- debian/libc0.1-dev-i386/usr/include/sys
-mkdir -p debian/libc0.1-dev-i386/usr/include/i486-kfreebsd-gnu
+
+mkdir -p debian/libc6-dev-i386/usr/include/i386-kfreebsd-gnu
+ln -s x86_64-kfreebsd-gnu/bits debian/libc6-dev-i386/usr/include/
+ln -s x86_64-kfreebsd-gnu/gnu debian/libc6-dev-i386/usr/include/
+
+mkdir -p debian/libc6-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
+cp -a debian/tmp-i386/usr/include/i386-kfreebsd-gnu/gnu/stubs-32.h \
+ debian/libc6-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
+
+mkdir -p debian/libc6-dev-i386/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/x86_64-kfreebsd-gnu/sys` ; do \
+ ln -s ../x86_64-kfreebsd-gnu/sys/$$i debian/libc6-dev-i386/usr/include/sys/$$i ; \
+done
+
+cp -a debian/tmp-i386/usr/include/i386-kfreebsd-gnu/sys/vm86.h \
+ debian/libc6-dev-i386/usr/include/sys
+
endef
define libc0.1-i386_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -15,12 +15,19 @@
ppc64_includedir = /usr/include/powerpc64-linux-gnu
define libc6-dev-ppc64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc64-linux-gnu
+ln -s powerpc-linux-gnu/bits debian/libc6-dev-ppc64/usr/include/
+ln -s powerpc-linux-gnu/gnu debian/libc6-dev-ppc64/usr/include/
+
mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu
-cp -af debian/tmp-ppc64/usr/include/powerpc64-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-amd64/usr/include/powerpc64-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu
-ln -s powerpc-linux-gnu/gnu debian/libc6-dev-ppc64/usr/include/gnu
-ln -s powerpc-linux-gnu/sys debian/libc6-dev-ppc64/usr/include/sys
-ln -s powerpc-linux-gnu/bits debian/libc6-dev-ppc64/usr/include/bits
-mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc64-linux-gnu
+
+mkdir -p debian/libc6-dev-ppc64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/powerpc-linux-gnu/sys` ; do \
+ ln -s ../powerpc-linux-gnu/sys/$$i debian/libc6-dev-ppc64/usr/include/sys/$$i ; \
+done
+
endef
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -21,13 +21,20 @@
powerpc_libdir = /usr/lib32
define libc6-dev-powerpc_extra_pkg_install
+
+mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
+ln -s powerpc64-linux-gnu/bits debian/libc6-dev-powerpc/usr/include/
+ln -s powerpc64-linux-gnu/gnu debian/libc6-dev-powerpc/usr/include/
+
mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu
-cp -af debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \
+cp -a debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \
debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu
-ln -s powerpc64-linux-gnu/gnu debian/libc6-dev-powerpc/usr/include/gnu
-ln -s powerpc64-linux-gnu/sys debian/libc6-dev-powerpc/usr/include/sys
-ln -s powerpc64-linux-gnu/bits debian/libc6-dev-powerpc/usr/include/bits
-mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
+
+mkdir -p debian/libc6-dev-powerpc/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/powerpc64-linux-gnu/sys` ; do \
+ ln -s ../powerpc64-linux-gnu/sys/$$i debian/libc6-dev-powerpc/usr/include/sys/$$i ; \
+done
+
endef
# create a symlink for the 32 bit dynamic linker in /lib
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -13,13 +13,20 @@
s390x_libdir = /usr/lib64
define libc6-dev-s390x_extra_pkg_install
+
+mkdir -p debian/libc6-dev-s390x/usr/include/s390x-linux-gnu
+ln -s s390-linux-gnu/bits debian/libc6-dev-s390x/usr/include/
+ln -s s390-linux-gnu/gnu debian/libc6-dev-s390x/usr/include/
+
mkdir -p debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu
-cp -af debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu
-ln -s s390-linux-gnu/gnu debian/libc6-dev-s390x/usr/include/gnu
-ln -s s390-linux-gnu/sys debian/libc6-dev-s390x/usr/include/sys
-ln -s s390-linux-gnu/bits debian/libc6-dev-s390x/usr/include/bits
-mkdir -p debian/libc6-dev-s390x/usr/include/s390x-linux-gnu
+
+mkdir -p debian/libc6-dev-s390x/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/s390-linux-gnu/sys` ; do \
+ ln -s ../s390-linux-gnu/sys/$$i debian/libc6-dev-s390x/usr/include/sys/$$i ; \
+done
+
endef
define libc6-s390x_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -19,13 +19,20 @@
s390_libdir = /usr/lib32
define libc6-dev-s390_extra_pkg_install
+
+mkdir -p debian/libc6-dev-s390/usr/include/s390-linux-gnu
+ln -s s390x-linux-gnu/bits debian/libc6-dev-s390/usr/include/
+ln -s s390x-linux-gnu/gnu debian/libc6-dev-s390/usr/include/
+
mkdir -p debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu
-cp -af debian/tmp-s390/usr/include/s390-linux-gnu/gnu/stubs-32.h \
+cp -a debian/tmp-s390/usr/include/s390-linux-gnu/gnu/stubs-32.h \
debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu
-ln -s s390x-linux-gnu/gnu debian/libc6-dev-s390/usr/include/gnu
-ln -s s390x-linux-gnu/sys debian/libc6-dev-s390/usr/include/sys
-ln -s s390x-linux-gnu/bits debian/libc6-dev-s390/usr/include/bits
-mkdir -p debian/libc6-dev-s390/usr/include/s390-linux-gnu
+
+mkdir -p debian/libc6-dev-s390/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/s390x-linux-gnu/sys` ; do \
+ ln -s ../s390x-linux-gnu/sys/$$i debian/libc6-dev-s390/usr/include/sys/$$i ; \
+done
+
endef
define libc6-s390_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-27 00:58:23 UTC (rev 4827)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-30 11:30:11 UTC (rev 4828)
@@ -15,11 +15,18 @@
sparc64_libdir = /usr/lib64
define libc6-dev-sparc64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu
+ln -s sparc-linux-gnu/bits debian/libc6-dev-sparc64/usr/include/
+ln -s sparc-linux-gnu/gnu debian/libc6-dev-sparc64/usr/include/
+
mkdir -p debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu
-cp -af debian/tmp-sparc64/usr/include/sparc64-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-sparc64/usr/include/sparc64-linux-gnu/gnu/stubs-64.h \
debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu
-ln -s sparc-linux-gnu/gnu debian/libc6-dev-sparc64/usr/include/gnu
-ln -s sparc-linux-gnu/sys debian/libc6-dev-sparc64/usr/include/sys
-ln -s sparc-linux-gnu/bits debian/libc6-dev-sparc64/usr/include/bits
-mkdir -p debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu
+
+mkdir -p debian/libc6-dev-sparc64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/sparc-linux-gnu/sys` ; do \
+ ln -s ../sparc-linux-gnu/sys/$$i debian/libc6-dev-sparc64/usr/include/sys/$$i ; \
+done
+
endef
Reply to: