Author: adconrad
Date: 2013-12-01 16:58:05 +0000 (Sun, 01 Dec 2013)
New Revision: 5845

Modified:
   glibc-package/branches/eglibc-2.18/debian/changelog
   glibc-package/branches/eglibc-2.18/debian/rules
Log:
debian/rules: Set configure_build the same as configure_target above, so
we don't think we're cross-building and skip half the testsuite on i386.

Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-01 16:34:44 UTC 
(rev 5844)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-01 16:58:05 UTC 
(rev 5845)
@@ -83,6 +83,8 @@
     architectures as gcc-4.6 and gcc-4.7 are going away in the near future.
   * debian/rules: Build for i586 where dpkg-architecture claims i486, which
     matches the default that gcc-4.8 has had on i386 for the last two years.
+  * debian/rules: Set configure_build the same as configure_target above, so
+    we don't think we're cross-building and skip half the testsuite on i386.
 
   [ Samuel Thibault ]
   * patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Rebased.

Modified: glibc-package/branches/eglibc-2.18/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules     2013-12-01 16:34:44 UTC 
(rev 5844)
+++ glibc-package/branches/eglibc-2.18/debian/rules     2013-12-01 16:58:05 UTC 
(rev 5845)
@@ -124,7 +124,7 @@
 # that build daemons be able to run a particular optimized library, then
 # they can set the --build to match --host for that optimized build.
 # Among other things this lets tests run.
-configure_build := $(DEB_BUILD_GNU_TYPE)
+configure_build := $(subst i486,i586,$(DEB_BUILD_GNU_TYPE))
 
 log_build    = $(build-tree)/log-build-$(call xx,configure_target)-$(curpass)
 log_test     = $(build-tree)/log-test-$(call xx,configure_target)-$(curpass)


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to