r5097 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2011-12-19 12:06:03 +0000 (Mon, 19 Dec 2011)
New Revision: 5097
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/armel.mk
glibc-package/trunk/debian/sysdeps/armhf.mk
Log:
* sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-12-19 06:28:35 UTC (rev 5096)
+++ glibc-package/trunk/debian/changelog 2011-12-19 12:06:03 UTC (rev 5097)
@@ -9,6 +9,7 @@
Closes: #650790.
* Don't provide debugging symbols for libc-bin, libc-dev-bin and nscd
packages to avoid conflicts with multiarch.
+ * sysdeps/armel.mk, sysdeps/armhf.mk: fix cross compiling.
-- Aurelien Jarno <aurel32@debian.org> Wed, 14 Dec 2011 00:42:25 +0100
Modified: glibc-package/trunk/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armel.mk 2011-12-19 06:28:35 UTC (rev 5096)
+++ glibc-package/trunk/debian/sysdeps/armel.mk 2011-12-19 12:06:03 UTC (rev 5097)
@@ -3,8 +3,8 @@
#EGLIBC_PASSES += armhf
#DEB_ARCH_REGULAR_PACKAGES += libc6-armhf libc6-dev-armhf
#armhf_add-ons = ports nptl $(add-ons)
-#armhf_CC = $(BUILD_CC) -mfloat-abi=hard
-#armhf_CXX = $(BUILD_CXX) -mfloat-abi=hard
+#armhf_CC = $(CC) -mfloat-abi=hard
+#armhf_CXX = $(CXX) -mfloat-abi=hard
#armhf_slibdir = /lib/arm-linux-gnueabihf
#armhf_libdir = /usr/lib/arm-linux-gnueabihf
## To be coinstallable with armel, we install ld.so to a multiarch directory
Modified: glibc-package/trunk/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armhf.mk 2011-12-19 06:28:35 UTC (rev 5096)
+++ glibc-package/trunk/debian/sysdeps/armhf.mk 2011-12-19 12:06:03 UTC (rev 5097)
@@ -1,10 +1,7 @@
libc_add-ons = ports nptl $(add-ons)
# Use gcc-4.6 on armhf to get correct atomic operations in thumb-2 mode
-ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = $(DEB_HOST_GNU_TYPE)-gcc
-CXX = $(DEB_HOST_GNU_TYPE)-g++
-else
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
CC = gcc-4.6
CXX = g++-4.6
endif
@@ -23,8 +20,8 @@
#EGLIBC_PASSES += armel
#DEB_ARCH_REGULAR_PACKAGES += libc6-armel libc6-dev-armel
#armel_add-ons = ports nptl $(add-ons)
-#armel_CC = $(BUILD_CC) -mfloat-abi=softfp
-#armel_CXX = $(BUILD_CXX) -mfloat-abi=softfp
+#armel_CC = $(CC) -mfloat-abi=softfp
+#armel_CXX = $(CXX) -mfloat-abi=softfp
#armel_slibdir = /lib/arm-linux-gnueabi
#armel_libdir = /usr/lib/arm-linux-gnueabi
#armel_rtlddir = /lib
Reply to: