Bug#361642: i386 gconv modules not found on amd64
* Matthias Klose <doko@cs.tu-berlin.de> [2006-04-09 14:03]:
> third party applications like 32bit acroread won't start.
> http://people.ubuntu.com/patches/glibc-amd64.diff
attached.
--
Martin Michlmayr
http://www.cyrius.com/
* debian/debhelper.in/libc-alt.install: Add gconv-modules, the addition
in debian/sysdeps/amd64.mk is overwritten.
* libc6-i386 (amd64). Fix path of gconv-modules and install gconv-modules.
Ubuntu #34324, #34427.
diff -u glibc-2.3.6/debian/sysdeps/amd64.mk glibc-2.3.6/debian/sysdeps/amd64.mk
--- glibc-2.3.6/debian/sysdeps/amd64.mk
+++ glibc-2.3.6/debian/sysdeps/amd64.mk
@@ -21,6 +21,7 @@
i386_configure_target=i686-linux
i386_configure_build=i686-linux
i386_CC = $(BUILD_CC) -m32
+i386_MAKEFLAGS = MAKEFLAGS="gconvdir=/usr/lib32/gconv"
i386_extra_cflags = -march=i686 -mtune=i686 -g2 -O3
i386_LIBDIR = 32
i386_MIN_KERNEL_SUPPORTED = 2.6.0
@@ -33,6 +34,7 @@
endef
define extra_debhelper
+echo debian/tmp-i386/usr/lib32/gconv/gconv-modules usr/lib32/gconv >>debian/libc6-i386.install
echo debian/tmp-i386/usr/include/i386-linux-gnu usr/include >>debian/libc6-dev-i386.install
endef
diff -u glibc-2.3.6/debian/debhelper.in/libc-alt.install glibc-2.3.6/debian/debhelper.in/libc-alt.install
--- glibc-2.3.6/debian/debhelper.in/libc-alt.install
+++ glibc-2.3.6/debian/debhelper.in/libc-alt.install
@@ -1,3 +1,4 @@
-# This file is used for 64-bit libraries.
+# This file is used for 32-bit and 64-bit libraries.
TMPDIR/lib*/*.so* libDESTLIBDIR
TMPDIR/usr/lib*/gconv/*.so* usr/libDESTLIBDIR/gconv
+TMPDIR/usr/lib*/gconv/gconv-modules usr/libDESTLIBDIR/gconv
diff -u glibc-2.3.6/debian/rules.d/build.mk glibc-2.3.6/debian/rules.d/build.mk
--- glibc-2.3.6/debian/rules.d/build.mk
+++ glibc-2.3.6/debian/rules.d/build.mk
@@ -69,7 +69,7 @@
$(patsubst %,build_%,$(GLIBC_PASSES)) :: build_% : $(stamp)build_%
$(stamp)build_%: $(stamp)configure_%
@echo Building $(curpass)
- $(call logme, -a $(log_build), $(MAKE) -j$(NJOBS) -C $(DEB_BUILDDIR))
+ $(call logme, -a $(log_build), $(MAKE) -j$(NJOBS) $(call xx,MAKEFLAGS) -C $(DEB_BUILDDIR))
touch $@
$(patsubst %,check_%,$(GLIBC_PASSES)) :: check_% : $(stamp)check_%
@@ -84,7 +84,7 @@
echo "Testsuite disabled for $(curpass), skipping tests."; \
else \
echo Testing $(curpass); \
- $(MAKE) -C $(DEB_BUILDDIR) -j$(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ $(MAKE) -C $(DEB_BUILDDIR) -j$(NJOBS) $(call xx,MAKEFLAGS) -k check 2>&1 | tee -a $(log_test); \
fi
touch $@
Reply to: