Author: aurel32
Date: 2009-11-10 19:25:19 +0000 (Tue, 10 Nov 2009)
New Revision: 3958
Removed:
glibc-package/trunk/debian/debhelper.in/libc-alt.postinst
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-alt.install
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.postrm
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Generate /usr/lib{,32,64}/gconv/gconv-modules.cache at build time
instead of during package installation. Closes: #548042.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-10 14:34:43 UTC (rev
3957)
+++ glibc-package/trunk/debian/changelog 2009-11-10 19:25:19 UTC (rev
3958)
@@ -13,12 +13,12 @@
* Reenable PIE on mips and build-depends on binutils (>= 2.20-3).
* Build-depends on g++-4.4 (>= 4.4.2-2) and use gcc-4.4 on armel.
* libc-bin-dev: recommends manpages-dev. Closes: #485608.
- * debian/debhelper.in/libc-alt.postinst: Call iconvconfig to generate
- /usr/lib{32,64}/gconv/gconv-modules.cache. Closes: #548042.
+ * Generate /usr/lib{,32,64}/gconv/gconv-modules.cache at build time
+ instead of during package installation. Closes: #548042.
* debhelper.in/locales-all.prerm: remove /usr/lib/locale on removal, to
make puiparts happy.
- -- Aurelien Jarno <[email protected]> Tue, 10 Nov 2009 15:34:13 +0100
+ -- Aurelien Jarno <[email protected]> Tue, 10 Nov 2009 20:24:18 +0100
eglibc (2.10.1-6) unstable; urgency=high
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2009-11-10
14:34:43 UTC (rev 3957)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2009-11-10
19:25:19 UTC (rev 3958)
@@ -1,6 +1,5 @@
# This file is used for biarch libraries.
TMPDIR/SLIBDIR/*.so* SLIBDIR
-TMPDIR/LIBDIR/gconv/*.so* LIBDIR/gconv/
-TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv
+TMPDIR/LIBDIR/gconv/* LIBDIR/gconv/
BUILD-TREE/test-results-*-FLAVOR usr/share/doc/LIBC-FLAVOR
Deleted: glibc-package/trunk/debian/debhelper.in/libc-alt.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.postinst 2009-11-10
14:34:43 UTC (rev 3957)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.postinst 2009-11-10
19:25:19 UTC (rev 3958)
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-export LC_ALL=C
-
-if [ "$type" = "configure" ]
-then
- # Generate cache file LIBDIR/gconv/gconv-modules.cache
- iconvconfig -o LIBDIR/gconv/gconv-modules.cache LIBDIR/gconv || true
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2009-11-10
14:34:43 UTC (rev 3957)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2009-11-10
19:25:19 UTC (rev 3958)
@@ -1,6 +1,5 @@
TMPDIR/SLIBDIR/*.so* SLIBDIR
-TMPDIR/LIBDIR/gconv/*.so LIBDIR/gconv
-TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv
+TMPDIR/LIBDIR/gconv/* LIBDIR/gconv
TMPDIR/etc/ld.so.conf.d /etc
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-11-10
14:34:43 UTC (rev 3957)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-11-10
19:25:19 UTC (rev 3958)
@@ -215,9 +215,6 @@
fi # end upgrading and $preversion lt 2.10-2
fi # Upgrading
- # Generate cache file /usr/lib/gconv/gconv-modules.cache
- iconvconfig || true
-
if [ "`uname -s`" = Linux ]; then
if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)"
]; then
# the devicenumber/inode pair of / is the same as that of /sbin/init's
Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postrm 2009-11-10 14:34:43 UTC
(rev 3957)
+++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2009-11-10 19:25:19 UTC
(rev 3958)
@@ -9,8 +9,6 @@
suidunregister -s LIBC /usr/libexec/pt_chown
fi
fi
- # Created in the postinst by iconvconfig
- rm -f /usr/lib/gconv/gconv-modules.cache || true
fi
if [ "$1" = upgrade ]; then
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2009-11-10 14:34:43 UTC (rev
3957)
+++ glibc-package/trunk/debian/rules.d/build.mk 2009-11-10 19:25:19 UTC (rev
3958)
@@ -133,6 +133,13 @@
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
+ifneq (,$(findstring $(call xx,slibdir), /lib /lib32 /lib64))
+ # Generate gconv-modules.cache
+ /usr/sbin/iconvconfig --nostdlib
--prefix=$(CURDIR)/debian/tmp-$(curpass) \
+ -o $(CURDIR)/debian/tmp-$(curpass)/$(call
xx,libdir)/gconv/gconv-modules.cache \
+ $(call xx,libdir)/gconv
+endif
+
# Generate the list of SUPPORTED locales
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=localedata/SUPPORTED \
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
