r6239 - glibc-package/trunk/debian
Author: aurel32
Date: 2014-08-14 18:17:55 +0000 (Thu, 14 Aug 2014)
New Revision: 6239
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
Log:
debian/rules: change the GNU triplet from i586 to i486 when computing
the compiler name, as the name provided by dpkg (i586-linux-gnu)
doesn't match the gcc name (i486-linux-gnu-gcc-4.8).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-08-14 16:27:19 UTC (rev 6238)
+++ glibc-package/trunk/debian/changelog 2014-08-14 18:17:55 UTC (rev 6239)
@@ -1,6 +1,9 @@
glibc (2.19-10) UNRELEASED; urgency=medium
- *
+ [ Aurelien Jarno ]
+ * debian/rules: change the GNU triplet from i586 to i486 when computing
+ the compiler name, as the name provided by dpkg (i586-linux-gnu)
+ doesn't match the gcc name (i486-linux-gnu-gcc-4.8).
-- Aurelien Jarno <aurel32@debian.org> Thu, 14 Aug 2014 18:26:45 +0200
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2014-08-14 16:27:19 UTC (rev 6238)
+++ glibc-package/trunk/debian/rules 2014-08-14 18:17:55 UTC (rev 6239)
@@ -108,11 +108,12 @@
RUN_TESTSUITE = yes
-# Set cross and native compiler names, including version
-CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION)
-CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION)
-BUILD_CC = $(DEB_BUILD_GNU_TYPE)-$(BASE_CC)
-BUILD_CXX = $(DEB_BUILD_GNU_TYPE)-$(BASE_CXX)
+# Set cross and native compiler names, including version. On *i386 we need to
+# change the GNU triplet as it doesn't match the compiler name.
+CC = $(subst i586,i486,$(DEB_HOST_GNU_TYPE))-$(BASE_CC)$(DEB_GCC_VERSION)
+CXX = $(subst i586,i486,$(DEB_HOST_GNU_TYPE))-$(BASE_CXX)$(DEB_GCC_VERSION)
+BUILD_CC = $(subst i586,i486,$(DEB_BUILD_GNU_TYPE))-$(BASE_CC)
+BUILD_CXX = $(subst i586,i486,$(DEB_BUILD_GNU_TYPE))-$(BASE_CXX)
BUILD_CFLAGS = -O2 -g
HOST_CFLAGS = -pipe -O2 -g $(call xx,extra_cflags)
Reply to: