Author: adconrad Date: 2012-10-26 01:43:07 +0000 (Fri, 26 Oct 2012) New Revision: 5342
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk Log: Port more DEB_STAGE->DEB_BUILD_PROFILE changes from Ubuntu Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk =================================================================== --- glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk 2012-10-26 01:27:29 UTC (rev 5341) +++ glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk 2012-10-26 01:43:07 UTC (rev 5342) @@ -177,12 +177,38 @@ touch $@ +ifeq ($(DEB_BUILD_PROFILE),bootstrap) $(patsubst %,debhelper_%,$(EGLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_% $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_% libdir=$(call xx,libdir) ; \ slibdir=$(call xx,slibdir) ; \ rtlddir=$(call xx,rtlddir) ; \ curpass=$(curpass) ; \ + templates="libc-dev" ;\ + pass="" ; \ + suffix="" ;\ + for t in $$templates ; do \ + for s in debian/$$t$$pass.* ; do \ + t=`echo $$s | sed -e "s#libc\(.*\)$$pass#$(libc)\1$$suffix#"` ; \ + if [ "$$s" != "$$t" ] ; then \ + cp $$s $$t ; \ + fi ; \ + 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; \ + done ; \ + done + + egrep -v "LIBDIR.*.a " debian/$(libc)-dev.install >debian/$(libc)-dev.install- + mv debian/$(libc)-dev.install- debian/$(libc)-dev.install + sed -e "s#LIBDIR#lib#g" -i debian/$(libc)-dev.install +else +$(patsubst %,debhelper_%,$(EGLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_% +$(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_% + libdir=$(call xx,libdir) ; \ + slibdir=$(call xx,slibdir) ; \ + rtlddir=$(call xx,rtlddir) ; \ + curpass=$(curpass) ; \ rtld_so=`LANG=C LC_ALL=C readelf -l debian/tmp-$$curpass/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \ case "$$curpass:$$slibdir" in \ libc:*) \ @@ -215,6 +241,7 @@ sed -e "s#RTLD_SO#$$rtld_so#g" -i $$t ; \ done ; \ done +endif touch $@ -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tryx2-0002xw...@vasks.debian.org