From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay03.ispgateway.de ([80.67.31.26]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1V9XTT-0004Gx-Hz for ptxdist@pengutronix.de; Wed, 14 Aug 2013 11:34:40 +0200 Received: from [78.47.165.117] (helo=regiomontanus.your-server.de) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1V9XTT-0005i4-5R for ptxdist@pengutronix.de; Wed, 14 Aug 2013 11:34:39 +0200 From: Bernhard Walle Date: Wed, 14 Aug 2013 11:34:32 +0200 Message-Id: <1376472872-7936-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] glibc: Make it possible to install ldd Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 The standalone ldd of ptxdist doesn't work with all toolchains. For example, for my ct-ng based toolchain, /lib/ld-linux-armhf.so.3 must be in the RTLDLIST. Instead of adding more intelligence to the script, we just install the ldd from the toolchain which already has the right RTLDLIST. The patch also adds some guard for the standalone ldd to avoid selecting both variants in the configuration. Signed-off-by: Bernhard Walle --- rules/glibc.in | 7 +++++++ rules/glibc.make | 5 +++++ rules/ldd.in | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/rules/glibc.in b/rules/glibc.in index 2f2fb09..de214d0 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -163,6 +163,13 @@ config GLIBC_RESOLV will need both libraries if your /etc/nsswitch.conf contains a line like "hosts: file dns" +config GLIBC_LDD + bool + prompt "Install ldd" + help + Install 'ldd' from the toolchain. + + config GLIBC_NSL bool prompt "Install libnsl" diff --git a/rules/glibc.make b/rules/glibc.make index d2c5519..d1dea73 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -99,6 +99,11 @@ ifdef PTXCONF_GLIBC_RESOLV @$(call install_copy_toolchain_lib, glibc, libresolv.so) endif +ifdef PTXCONF_GLIBC_LDD + @echo "Installing ldd" + $(call install_copy_toolchain_usr, glibc, bin/ldd) +endif + ifdef PTXCONF_GLIBC_NSL @$(call install_copy_toolchain_lib, glibc, libnsl.so) endif diff --git a/rules/ldd.in b/rules/ldd.in index 66422c2..33756bb 100644 --- a/rules/ldd.in +++ b/rules/ldd.in @@ -3,5 +3,9 @@ config LDD tristate prompt "ldd" + depends on !GLIBC_LDD || ALLYES help ldd prints shared library dependencies of object files + +comment "glibc 'ldd' is selected" + depends on GLIBC_LDD -- 1.8.3.4 -- ptxdist mailing list ptxdist@pengutronix.de