Bug#625846: eglibc: FTBFS on armhf, does not detect triplet.
On 6 May 2011 15:22, Aurelien Jarno <aurelien@aurel32.net> wrote:
> Previous version has been built with the old triplet, nothing has
> changed on the eglibc side. Please send me a patch, I'll apply it.
OK, patch works, the build was successful and the generated
package works.
Thanks
Konstantinos
diff -ruN eglibc-2.13/debian/patches/any/submitted-autotools.diff eglibc-2.13.armhf//debian/patches/any/submitted-autotools.diff
--- eglibc-2.13/debian/patches/any/submitted-autotools.diff 2011-05-07 08:45:05.000000000 +0000
+++ eglibc-2.13.armhf//debian/patches/any/submitted-autotools.diff 2011-05-06 16:10:43.967298110 +0000
@@ -140,7 +140,7 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
-@@ -830,6 +852,16 @@
+@@ -830,6 +852,21 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
@@ -150,7 +150,12 @@
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ if echo __ARM_PCS_VFP__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP__
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ endif
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
diff -ruN eglibc-2.13/ports/sysdeps/arm/preconfigure eglibc-2.13.armhf//ports/sysdeps/arm/preconfigure
--- eglibc-2.13/ports/sysdeps/arm/preconfigure 2010-12-06 20:43:02.000000000 +0000
+++ eglibc-2.13.armhf//ports/sysdeps/arm/preconfigure 2011-05-06 15:57:15.087298361 +0000
@@ -2,7 +2,7 @@
arm*)
base_machine=arm
case $config_os in
- linux-gnueabi)
+ linux-gnueabi*)
machine=arm/eabi/$machine
if [ "${CFLAGS+set}" != "set" ]; then
CFLAGS="-g -O2"
diff -ruN eglibc-2.13/ports/sysdeps/arm/shlib-versions eglibc-2.13.armhf//ports/sysdeps/arm/shlib-versions
--- eglibc-2.13/ports/sysdeps/arm/shlib-versions 2006-08-17 01:23:58.000000000 +0000
+++ eglibc-2.13.armhf//ports/sysdeps/arm/shlib-versions 2011-05-06 15:57:27.067299108 +0000
@@ -1,4 +1,4 @@
-arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4
+arm.*-.*-linux-gnueabi* DEFAULT GLIBC_2.4
-arm.*-.*-linux-gnueabi ld=ld-linux.so.3
+arm.*-.*-linux-gnueabi* ld=ld-linux.so.3
arm.*-.*-linux.* ld=ld-linux.so.2
Reply to: