[glibc] 01/01: debian/rules, debian/rules.d/build.mk: move the C.UTF-8 locale and locales-all generation to a separate target instead of building them in the build_libc target.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 8d72e21370ece1672aa99f367a9bdf2eed26891c
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Mar 20 20:30:29 2016 +0100
debian/rules, debian/rules.d/build.mk: move the C.UTF-8 locale and locales-all generation to a separate target instead of building them in the build_libc target.
---
debian/changelog | 3 +++
debian/rules | 4 +++-
debian/rules.d/build.mk | 26 +++++++++++++++-----------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75306ce..25a2aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ glibc (2.22-4) UNRELEASED; urgency=medium
- Fix a memory leak in the resolver. Closes: #818178.
* debian/patches/localedata/fr_CA-first_weekday.diff: drop. Closes:
#769051.
+ * debian/rules, debian/rules.d/build.mk: move the C.UTF-8 locale and
+ locales-all generation to a separate target instead of building them
+ in the build_libc target.
[ Samuel Thibault ]
* patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff,tg-sendmsg-SCM_CREDS.diff:
diff --git a/debian/rules b/debian/rules
index 2aef770..dcf3cf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -218,7 +218,9 @@ clean:: unpatch
# Required Debian targets
build-arch: $(stamp)info \
$(patsubst %,$(stamp)build_%,$(GLIBC_PASSES)) \
- $(patsubst %,$(stamp)check_%,$(GLIBC_PASSES))
+ $(patsubst %,$(stamp)check_%,$(GLIBC_PASSES)) \
+ $(stamp)build_C.UTF-8 \
+ $(stamp)build_locales-all
build-indep: $(stamp)source
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index ddb3ced..5aedb83 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -109,17 +109,6 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
else
$(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; \
- sync; \
- rdfind -outputname /dev/null -makesymlinks true -removeidentinode false $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
- symlinks -r -s -c $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
- fi
endif
touch $@
@@ -289,6 +278,21 @@ ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
endif
touch $@
+$(stamp)build_C.UTF-8: $(stamp)/build_libc
+ I18NPATH=$(CURDIR)/localedata GCONV_PATH=$(DEB_BUILDDIR)/iconvdata \
+ localedef --quiet -c -f UTF-8 -i C $(CURDIR)/build-tree/C.UTF-8
+ touch $@
+
+$(stamp)build_locales-all: $(stamp)/build_libc
+ $(MAKE) -C $(build-tree)/$(DEB_HOST_ARCH)-libc $(NJOBS) \
+ objdir=$(build-tree)/$(DEB_HOST_ARCH)-libc \
+ install_root=$(CURDIR)/build-tree/locales-all \
+ localedata/install-locales
+ rdfind -outputname /dev/null -makesymlinks true -removeidentinode false \
+ $(CURDIR)/build-tree/locales-all/usr/lib/locale
+ symlinks -r -s -c $(CURDIR)/build-tree/locales-all/usr/lib/locale
+ touch $@
+
$(stamp)source: $(stamp)patch
mkdir -p $(build-tree)
cd .. && \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: