Author: adconrad Date: 2015-03-19 22:15:39 +0000 (Thu, 19 Mar 2015) New Revision: 6394
Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk Log: debian/rules.d/debhelper.mk: Fix bootstrap libdirs (Closes: #715059) Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-19 21:15:35 UTC (rev 6393) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-19 22:15:39 UTC (rev 6394) @@ -109,6 +109,7 @@ * debian/patches/i386/submitted-i686-timing.diff: Fix -Wundef warnings. * debian/patches/arm/unsubmitted-ldso-abi-check.diff: Fix build failures from format mismatches, uninitialised variables, and const conversions. + * debian/rules.d/debhelper.mk: Fix bootstrap libdirs (Closes: #715059) * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Same as above. * Other than two hurd-i386 patches required as scaffolding for others, all the hurd-i386 patches are disabled, so this build *will* fail there. Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk =================================================================== --- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-19 21:15:35 UTC (rev 6393) +++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-03-19 22:15:39 UTC (rev 6394) @@ -209,10 +209,11 @@ sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \ sed -e "s#RTLDDIR#$$rtlddir#g" -i $$t; \ sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \ + sed -e "s#LIBDIR#$$libdir#g" -i $$t; \ done ; \ done - sed -e "/LIBDIR.*.a /d" -e "s#LIBDIR#lib#g" -i debian/$(libc)-dev.install + sed -e "/$$libdir.*.a /d" -i debian/$(libc)-dev.install else $(patsubst %,debhelper_%,$(GLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_% $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_% -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yyij5-0000qr...@moszumanska.debian.org