r4831 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2011-07-31 00:33:19 +0000 (Sun, 31 Jul 2011)
New Revision: 4831
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:
* sysdeps/*.mk: install the biarch includes in /usr/include instead
of the multiarch path. Fix FTBFS on some architectures.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/changelog 2011-07-31 00:33:19 UTC (rev 4831)
@@ -1,3 +1,10 @@
+eglibc (2.13-13) UNRELEASED; urgency=low
+
+ * sysdeps/*.mk: install the biarch includes in /usr/include instead
+ of the multiarch path. Fix FTBFS on some architectures.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 31 Jul 2011 02:31:45 +0200
+
eglibc (2.13-12) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -26,18 +26,17 @@
i386_CXX = $(CC) -m32
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-profile
-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
+mkdir -p debian/libc6-dev-i386/usr/include
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 -a debian/tmp-i386/usr/include/i386-linux-gnu/gnu/stubs-32.h \
+cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
mkdir -p debian/libc6-dev-i386/usr/include/sys
@@ -45,9 +44,9 @@
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 \
+cp -a debian/tmp-i386/usr/include/sys/elf.h \
debian/libc6-dev-i386/usr/include/sys
-cp -a debian/tmp-i386/usr/include/i386-linux-gnu/sys/vm86.h \
+cp -a debian/tmp-i386/usr/include/sys/vm86.h \
debian/libc6-dev-i386/usr/include/sys
endef
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -62,12 +62,12 @@
define libc6-dev-amd64_extra_pkg_install
-mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnu
+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/
mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
-cp -a debian/tmp-amd64/usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+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
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -18,27 +18,26 @@
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/i386-kfreebsd-gnu
i386_slibdir = /lib32
i386_libdir = /usr/lib32
define libc0.1-dev-i386_extra_pkg_install
-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/libc0.1-dev-i386/usr/include
+ln -s x86_64-kfreebsd-gnu/bits debian/libc0.1-dev-i386/usr/include/
+ln -s x86_64-kfreebsd-gnu/gnu debian/libc0.1-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/libc0.1-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
+cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
+ debian/libc0.1-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
-mkdir -p debian/libc6-dev-i386/usr/include/sys
+mkdir -p debian/libc0.1-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 ; \
+ ln -s ../x86_64-kfreebsd-gnu/sys/$$i debian/libc0.1-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
+cp -a debian/tmp-i386/usr/include/sys/vm86.h \
+ debian/libc0.1-dev-i386/usr/include/sys
endef
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -12,16 +12,15 @@
ppc64_rtlddir = /lib64
ppc64_slibdir = /lib64
ppc64_libdir = /usr/lib64
-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
+mkdir -p debian/libc6-dev-ppc64/usr/include
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 -a debian/tmp-amd64/usr/include/powerpc64-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-ppc64/usr/include/gnu/stubs-64.h \
debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu
mkdir -p debian/libc6-dev-ppc64/usr/include/sys
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -15,19 +15,18 @@
powerpc_configure_target = powerpc-linux-gnu
powerpc_CC = $(CC) -m32
powerpc_CXX = $(CXX) -m32
-powerpc_includedir = /usr/include/powerpc-linux-gnu
powerpc_extra_config_options := $(extra_config_options) --disable-profile
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
define libc6-dev-powerpc_extra_pkg_install
-mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
+mkdir -p debian/libc6-dev-powerpc/usr/include
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 -a debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \
+cp -a debian/tmp-powerpc/usr/include/gnu/stubs-32.h \
debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu
mkdir -p debian/libc6-dev-powerpc/usr/include/sys
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -7,19 +7,18 @@
s390x_CXX = $(CXX) -m64
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_config_options := $(extra_config_options) --disable-profile
-s390x_includedir = /usr/include/s390x-linux-gnu
s390x_rtlddir = /lib64
s390x_slibdir = /lib64
s390x_libdir = /usr/lib64
define libc6-dev-s390x_extra_pkg_install
-mkdir -p debian/libc6-dev-s390x/usr/include/s390x-linux-gnu
+mkdir -p debian/libc6-dev-s390x/usr/include
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 -a debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-s390x/usr/include/gnu/stubs-64.h \
debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu
mkdir -p debian/libc6-dev-s390x/usr/include/sys
Modified: glibc-package/trunk/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -14,18 +14,17 @@
s390_CC = $(CC) -m31
s390_CXX = $(CXX) -m31
s390_extra_config_options := $(extra_config_options) --disable-profile
-s390_includedir = /usr/include/s390-linux-gnu
s390_slibdir = /lib32
s390_libdir = /usr/lib32
define libc6-dev-s390_extra_pkg_install
-mkdir -p debian/libc6-dev-s390/usr/include/s390-linux-gnu
+mkdir -p debian/libc6-dev-s390/usr/include
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 -a debian/tmp-s390/usr/include/s390-linux-gnu/gnu/stubs-32.h \
+cp -a debian/tmp-s390/usr/include/gnu/stubs-32.h \
debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu
mkdir -p debian/libc6-dev-s390/usr/include/sys
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-30 13:27:44 UTC (rev 4830)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2011-07-31 00:33:19 UTC (rev 4831)
@@ -9,19 +9,18 @@
sparc64_CXX = $(CXX) -m64
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_extra_config_options = $(extra_config_options) --disable-profile
-sparc64_includedir = /usr/include/sparc64-linux-gnu
sparc64_rtlddir = /lib64
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
define libc6-dev-sparc64_extra_pkg_install
-mkdir -p debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu
+mkdir -p debian/libc6-dev-sparc64/usr/include
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 -a debian/tmp-sparc64/usr/include/sparc64-linux-gnu/gnu/stubs-64.h \
+cp -a debian/tmp-sparc64/usr/include/gnu/stubs-64.h \
debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu
mkdir -p debian/libc6-dev-sparc64/usr/include/sys
Reply to: