Author: aurel32 Date: 2015-09-08 17:53:15 +0000 (Tue, 08 Sep 2015) New Revision: 6525
Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk Log: Fix some issues with stage 1. Closes: #797831. Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-08 16:49:26 UTC (rev 6524) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-08 17:53:15 UTC (rev 6525) @@ -15,6 +15,9 @@ [ Aurelien Jarno ] * rules.d/debhelper.mk: replace GLIBC_VERSION before LIBC. Closes: #797538. + + [ Helmut Grohne ] + * Fix some issues with stage 1. Closes: #797831. -- Aurelien Jarno <aure...@debian.org> Sat, 29 Aug 2015 00:43:44 +0200 Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk =================================================================== --- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-09-08 16:49:26 UTC (rev 6524) +++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk 2015-09-08 17:53:15 UTC (rev 6525) @@ -206,10 +206,13 @@ case "$$curpass:$$slibdir" in \ libc:*) \ ;; \ - *:/lib32 | *:/lib64 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \ + *:/lib32 | *:/lib64 | *:/libo32 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \ pass="-alt" \ suffix="-$(curpass)" \ ;; \ + *:* ) \ + templates="" \ + ;; \ esac ; \ for t in $$templates ; do \ for s in debian/$$t$$pass.* ; do \ @@ -219,7 +222,7 @@ cp $$s $$t ; \ fi ; \ sed -i \ - -e "/$$libdir.*.a /d" \ + -e "/LIBDIR.*\.a /d" \ -e "s#TMPDIR#debian/tmp-$$curpass#g" \ -e "s#RTLDDIR#$$rtlddir#g" \ -e "s#SLIBDIR#$$slibdir#g" \