Author: aurel32 Date: 2009-09-07 21:10:38 +0000 (Mon, 07 Sep 2009) New Revision: 3813
Modified: glibc-package/branches/multiarch/debian/changelog glibc-package/branches/multiarch/debian/debhelper.in/libc.install glibc-package/branches/multiarch/debian/rules.d/build.mk Log: * Install a symlink ABI -> multiarch path. Modified: glibc-package/branches/multiarch/debian/changelog =================================================================== --- glibc-package/branches/multiarch/debian/changelog 2009-09-07 19:08:08 UTC (rev 3812) +++ glibc-package/branches/multiarch/debian/changelog 2009-09-07 21:10:38 UTC (rev 3813) @@ -2,8 +2,9 @@ * Use the multiarch path for the native version and optimized flavors. * Simplify the creation of /etc/ld.so.conf.d/<triplet>.conf. + * Install a symlink ABI -> multiarch path. - -- Aurelien Jarno <aure...@debian.org> Mon, 07 Sep 2009 21:04:08 +0200 + -- Aurelien Jarno <aure...@debian.org> Mon, 07 Sep 2009 23:10:09 +0200 eglibc (2.9-27) UNRELEASED; urgency=low Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.install =================================================================== --- glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-09-07 19:08:08 UTC (rev 3812) +++ glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-09-07 21:10:38 UTC (rev 3813) @@ -1,3 +1,4 @@ +TMPDIR/lib/*.so* /lib TMPDIR/SLIBDIR/*.so* SLIBDIR TMPDIR/LIBDIR/gconv/*.so LIBDIR/gconv TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk =================================================================== --- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-07 19:08:08 UTC (rev 3812) +++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-07 21:10:38 UTC (rev 3813) @@ -138,15 +138,23 @@ OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \ fi - # Create the multidir directories, and the configuration file in /etc/ld.so.conf.d + # Create the multiarch directories, and the configuration file in /etc/ld.so.conf.d if [ $(curpass) = libc ]; then \ mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \ conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$(DEB_HOST_GNU_TYPE).conf"; \ echo "# Multiarch support" > $$conffile; \ - echo /lib/$(DEB_HOST_GNU_TYPE) >> $$conffile; \ - echo /usr/lib/$(DEB_HOST_GNU_TYPE) >> $$conffile; \ + echo "$(call xx,slibdir)" >> $$conffile; \ + echo "$(call xx,libdir)" >> $$conffile; \ fi + # Create the ld.so symlink to the multiarch directory + if [ $(curpass) = libc ]; then \ + rtld_so="$$(LANG=C LC_ALL=C readelf -l debian/tmp-$(curpass)/usr/bin/iconv | grep 'interpreter' | sed -e 's/.*interpreter: \(.*\)]/\1/g')" ; \ + link_name="debian/tmp-$(curpass)/lib/$$(basename $$rtld_so)" ; \ + target="$(call xx,slibdir)/$$(readlink $$rtld_so)" ; \ + ln -s $$target $$link_name ; \ + fi + $(call xx,extra_install) touch $@ -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org