r5019 - glibc-package/trunk/debian
Author: aurel32
Date: 2011-10-30 16:13:19 +0000 (Sun, 30 Oct 2011)
New Revision: 5019
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
Log:
* debian/rules: don't build locales-all when cross-compiling. Closes:
#644771.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-10-30 16:12:35 UTC (rev 5018)
+++ glibc-package/trunk/debian/changelog 2011-10-30 16:13:19 UTC (rev 5019)
@@ -10,6 +10,8 @@
it. Closes: #644990.
* Add patches/alpha/submitted-fallocated.diff to define fallocate() in
<fcntl.h> on alpha. Closes: #641868.
+ * debian/rules: don't build locales-all when cross-compiling. Closes:
+ #644771.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-setresid.diff: New patch to fix -1 passed to
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2011-10-30 16:12:35 UTC (rev 5018)
+++ glibc-package/trunk/debian/rules 2011-10-30 16:13:19 UTC (rev 5019)
@@ -127,10 +127,15 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin locales-all multiarch-support
+DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin multiarch-support
DEB_INDEP_REGULAR_PACKAGES = glibc-doc eglibc-source locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
+## Locales can only be pre-generated during native compiles
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+DEB_ARCH_REGULAR_PACKAGES += locales-all
+endif
+
# Generic kernel version check
define kernel_check
(if [ $(CURRENT_KERNEL_VERSION) -lt $(1) ]; then \
Reply to: