From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1S7Odv-0001ot-Pi for ptxdist@pengutronix.de; Tue, 13 Mar 2012 11:07:47 +0100 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1S7Odv-0008V0-Oe for ptxdist@pengutronix.de; Tue, 13 Mar 2012 11:07:47 +0100 Date: Tue, 13 Mar 2012 11:07:47 +0100 From: Michael Olbrich Message-ID: <20120313100747.GJ29221@pengutronix.de> References: <1331587504-16721-1-git-send-email-linux@bohmer.net> <1331587504-16721-4-git-send-email-linux@bohmer.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1331587504-16721-4-git-send-email-linux@bohmer.net> Subject: Re: [ptxdist] [PATCH 4/5] [x86_64, libc] on multilib do not put all dynamic linkers in /lib Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Mon, Mar 12, 2012 at 10:25:03PM +0100, Remy Bohmer wrote: > It is assumed by the makefiles that all dynamic linkers must be put in > /lib. This is however not true. Especially on multilib configurations this > information cannot be guessed. By looking in the sysroot of the compiler > toolchain the right paths can be found. Default the scripts already look > there, so remove the unneeded options. No obvious issues but I need to do some more testing, to make sure it doesn't break any other toolchains. Michael > Signed-off-by: Remy Bohmer > --- > rules/glibc.make | 2 +- > rules/post/install.make | 9 +++------ > rules/uclibc.make | 2 +- > 3 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/rules/glibc.make b/rules/glibc.make > index c4e6724..3ddf249 100644 > --- a/rules/glibc.make > +++ b/rules/glibc.make > @@ -36,7 +36,7 @@ $(STATEDIR)/glibc.targetinstall: > @$(call install_fixup, glibc,DESCRIPTION,missing) > > ifdef PTXCONF_GLIBC_LD > - @$(call install_copy_toolchain_dl, glibc, /lib) > + @$(call install_copy_toolchain_dl, glibc) > endif > > ifdef PTXCONF_GLIBC_C > diff --git a/rules/post/install.make b/rules/post/install.make > index 4ad7f87..190ec28 100644 > --- a/rules/post/install.make > +++ b/rules/post/install.make > @@ -317,17 +317,14 @@ install_copy_toolchain_lib = \ > # install_copy_toolchain_dl > # > # $1: xpkg label > -# $2: destination > -# $3: strip (y|n) default is to strip > +# $2: strip (y|n) default is to strip > # > install_copy_toolchain_dl = \ > XPKG=$(subst _,-,$(strip $(1))); \ > - DST="$(strip $2)"; \ > - STRIP="$(strip $3)"; \ > - test "$${DST}" != "" && DST="-d $${DST}"; \ > + STRIP="$(strip $2)"; \ > $(call install_check, install_copy_toolchain_dl); \ > ${CROSS_ENV_CC} $(CROSS_ENV_STRIP) PKGDIR="$(PKGDIR)" \ > - $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER $${DST} -s "$${STRIP}" > + $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER -s "$${STRIP}" > > # > # install_copy_toolchain_other > diff --git a/rules/uclibc.make b/rules/uclibc.make > index 22583fd..c6cc86f 100644 > --- a/rules/uclibc.make > +++ b/rules/uclibc.make > @@ -30,7 +30,7 @@ $(STATEDIR)/uclibc.targetinstall: > @$(call install_fixup, uclibc,DESCRIPTION,missing) > > ifdef PTXCONF_UCLIBC > - @$(call install_copy_toolchain_dl, uclibc, /lib) > + @$(call install_copy_toolchain_dl, uclibc) > endif > > ifdef PTXCONF_UCLIBC_C > -- > 1.7.5.4 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de