r4832 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2011-07-31 00:42:54 +0000 (Sun, 31 Jul 2011)
New Revision: 4832
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Log:
* sysdeps/mips.*mk: fix triarch includes on mips and mipsel.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-31 00:33:19 UTC (rev 4831)
+++ glibc-package/trunk/debian/changelog 2011-07-31 00:42:54 UTC (rev 4832)
@@ -2,6 +2,7 @@
* sysdeps/*.mk: install the biarch includes in /usr/include instead
of the multiarch path. Fix FTBFS on some architectures.
+ * sysdeps/mips.*mk: fix triarch includes on mips and mipsel.
-- Aurelien Jarno <aurel32@debian.org> Sun, 31 Jul 2011 02:31:45 +0200
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2011-07-31 00:33:19 UTC (rev 4831)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2011-07-31 00:42:54 UTC (rev 4832)
@@ -13,6 +13,19 @@
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include
+ln -s mips-linux-gnu/bits debian/libc6-dev-mipsn32/usr/include/
+ln -s mips-linux-gnu/gnu debian/libc6-dev-mipsn32/usr/include/
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mips-linux-gnu/sys` ; do \
+ ln -s ../mips-linux-gnu/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
+done
+
+endef
+
# build 64-bit alternative library
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
@@ -26,6 +39,19 @@
mips64_libdir = /usr/lib64
mips64_extra_config_options := $(extra_config_options) --disable-profile
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -s mips-linux-gnu/bits debian/libc6-dev-mips64/usr/include/
+ln -s mips-linux-gnu/gnu debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mips-linux-gnu/sys` ; do \
+ ln -s ../mips-linux-gnu/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
# Need to put a tri-arch aware version of ldd in the base package
define mipsn32_extra_install
cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-07-31 00:33:19 UTC (rev 4831)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-07-31 00:42:54 UTC (rev 4832)
@@ -13,6 +13,19 @@
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include
+ln -s mips-linux-gnu/bits debian/libc6-dev-mipsn32/usr/include/
+ln -s mips-linux-gnu/gnu debian/libc6-dev-mipsn32/usr/include/
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mips-linux-gnu/sys` ; do \
+ ln -s ../mips-linux-gnu/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
+done
+
+endef
+
# build 64-bit alternative library
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
@@ -26,6 +39,19 @@
mips64_libdir = /usr/lib64
mips64_extra_config_options := $(extra_config_options) --disable-profile
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -s mips-linux-gnu/bits debian/libc6-dev-mips64/usr/include/
+ln -s mips-linux-gnu/gnu debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mips-linux-gnu/sys` ; do \
+ ln -s ../mips-linux-gnu/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
# build a loongson-2f optimized library
EGLIBC_PASSES += loongson2f
DEB_ARCH_REGULAR_PACKAGES += libc6-loongson2f
Reply to: