r4484 - in glibc-package/branches/eglibc-2.13/debian: . debhelper.in rules.d
Author: aurel32
Date: 2011-02-06 23:29:44 +0000 (Sun, 06 Feb 2011)
New Revision: 4484
Added:
glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.dirs
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install
glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk
Log:
* Build and install the C locales in libc-bin. Closes: #609306.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-06 22:34:02 UTC (rev 4483)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-06 23:29:44 UTC (rev 4484)
@@ -98,6 +98,7 @@
* Drop libc6-sparcv9b package on sparc/sparc64, optimizations are now
done through multi-arch (STT_GNU_IFUNC).
* Add patches/localedata/locale-C.diff to create a C locale.
+ * Build and install the C locales in libc-bin. Closes: #609306.
-- Aurelien Jarno <aurel32@debian.org> Sun, 06 Feb 2011 16:52:51 +0100
Added: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.dirs
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.dirs (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.dirs 2011-02-06 23:29:44 UTC (rev 4484)
@@ -0,0 +1 @@
+usr/lib/locale
Modified: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install 2011-02-06 22:34:02 UTC (rev 4483)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc-bin.install 2011-02-06 23:29:44 UTC (rev 4484)
@@ -15,3 +15,4 @@
debian/tmp-libc/usr/sbin/rpcinfo usr/bin
debian/tmp-libc/usr/sbin/zdump usr/bin
debian/tmp-libc/usr/sbin/zic usr/sbin
+BUILD-TREE/C.UTF-8 usr/lib/locales
Modified: glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk 2011-02-06 22:34:02 UTC (rev 4483)
+++ glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk 2011-02-06 23:29:44 UTC (rev 4484)
@@ -88,6 +88,9 @@
$(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS))
$(call logme, -a $(log_build), echo "---------------" ; echo -n "Build ended: " ; date --rfc-2822)
if [ $(curpass) = libc ]; then \
+ I18NPATH=$(CURDIR)/localedata GCONV_PATH=$(DEB_BUILDDIR)/iconvdata localedef --quiet -c -f UTF-8 -i C $(CURDIR)/build-tree/C.UTF-8 ; \
+ fi
+ if [ $(curpass) = libc ]; then \
$(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/build-tree/locales-all \
localedata/install-locales; \
Reply to: