r2807 - in glibc-package/trunk/debian: . debhelper.in rules.d
Author: aurel32
Date: 2008-02-10 20:45:44 +0000 (Sun, 10 Feb 2008)
New Revision: 2807
Added:
glibc-package/trunk/debian/debhelper.in/locales-all.dirs
glibc-package/trunk/debian/debhelper.in/locales-all.install
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
* rules.d/build.mk: build the locales in the build target instead of the
install one to workaround a bug in fakeroot. Closes: #464924.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-02-10 20:24:17 UTC (rev 2806)
+++ glibc-package/trunk/debian/changelog 2008-02-10 20:45:44 UTC (rev 2807)
@@ -29,10 +29,12 @@
Closes: #464022.
* patches/any/submitted-ieee754_h.diff: use __BIG_ENDIAN instead of
BIG_ENDIAN. Closes: #464594.
- * local/manpages/ld.so.8: Add missing options to manpage. Closes:
+ * local/manpages/ld.so.8: Add missing options to manpage. Closes:
#464395.
+ * rules.d/build.mk: build the locales in the build target instead of the
+ install one to workaround a bug in fakeroot. Closes: #464924.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 10 Feb 2008 21:23:02 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 10 Feb 2008 21:43:01 +0100
glibc (2.7-6) unstable; urgency=low
Added: glibc-package/trunk/debian/debhelper.in/locales-all.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.dirs (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.dirs 2008-02-10 20:45:44 UTC (rev 2807)
@@ -0,0 +1 @@
+usr/lib/locales-all
Added: glibc-package/trunk/debian/debhelper.in/locales-all.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.install (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.install 2008-02-10 20:45:44 UTC (rev 2807)
@@ -0,0 +1 @@
+build-tree/locales-all/supported.tar.lzma usr/lib/locales-all
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2008-02-10 20:24:17 UTC (rev 2806)
+++ glibc-package/trunk/debian/rules.d/build.mk 2008-02-10 20:45:44 UTC (rev 2807)
@@ -84,6 +84,12 @@
@echo Building $(curpass)
$(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS))
$(call logme, -a $(log_build), echo "---------------" ; echo -n "Build ended: " ; date --rfc-2822)
+ if [ $(curpass) = libc ]; then \
+ $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
+ objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/build-tree/locales-all \
+ localedata/install-locales; \
+ tar --use-compress-program /usr/bin/lzma --owner root --group root -cf $(CURDIR)/build-tree/locales-all/supported.tar.lzma -C $(CURDIR)/build-tree/locales-all/usr/lib/locale .; \
+ fi
touch $@
$(patsubst %,check_%,$(GLIBC_PASSES)) :: check_% : $(stamp)check_%
@@ -126,15 +132,10 @@
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
+ # Generate the list of SUPPORTED locales
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
- $(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
- objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass) \
- localedata/install-locales; \
- rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
- install -d $(CURDIR)/debian/locales-all/usr/lib/locales-all; \
- tar --use-compress-program /usr/bin/lzma -cf $(CURDIR)/debian/locales-all/usr/lib/locales-all/supported.tar.lzma -C $(CURDIR)/debian/tmp-libc/usr/lib/locale .; \
fi
# Create the multidir directories, and the configuration file in /etc/ld.so.conf.d
Reply to: