From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 07 May 2021 08:07:55 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1leteV-0003sz-QE for lore@lore.pengutronix.de; Fri, 07 May 2021 08:07:55 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1leteV-0001Lr-DE; Fri, 07 May 2021 08:07:55 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1letdi-0001LY-PB; Fri, 07 May 2021 08:07:06 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1letdi-0002IY-2u; Fri, 07 May 2021 08:07:06 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1letdi-00GYr3-0O; Fri, 07 May 2021 08:07:06 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 7 May 2021 08:07:06 +0200 Message-Id: <20210507060706.3947186-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210426210311.18897-1-christian.melki@t2data.com> References: <20210426210311.18897-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] Resolve lib and pkgconfig dirs dynamically. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 842b1b8e87c39ad2f727594d5e52441337a6c5d1. Michael [sent from post-receive hook] On Fri, 07 May 2021 08:07:05 +0200, Christian Melki wrote: > Toolchains usually adhere to ABI spec when dealing with ld.so placement. > https://sourceware.org/glibc/wiki/ABIList > On x86_64: /lib64/ld-linux-x86-64.so.2 > This will help in using a non-demultilibbed toolchain in ptxdist. > > Signed-off-by: Christian Melki > Message-Id: <20210426210311.18897-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh > index e878a3231701..91179e3cb65b 100644 > --- a/scripts/lib/ptxd_make_world_install.sh > +++ b/scripts/lib/ptxd_make_world_install.sh > @@ -238,7 +238,7 @@ ptxd_make_world_install_post() { > ptxd_make_world_init && > ( > if [ -n "${pkg_pkg_dir}" -a -d "${pkg_pkg_dir}" ]; then > - find "${pkg_pkg_dir}"{,/usr}/{lib,share}/pkgconfig -name *.pc \ > + find "${pkg_pkg_dir}"{,/usr}/{$(ptxd_get_lib_dir),share}/pkgconfig -name *.pc \ > -printf "%f\n" 2>/dev/null | sed 's/\.pc$//' > elif [ "${pkg_type}" != "target" -a -n "${pkg_build_dir}" -a -d "${pkg_build_dir}" ]; then > # workaround for packages that install directly to sysroot > diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper > index 53be1a98708e..d86fa7c683b5 100755 > --- a/scripts/pkg-config-wrapper > +++ b/scripts/pkg-config-wrapper > @@ -17,7 +17,7 @@ else > fi > > declare -a libdir system_path system_incpath > -libdir=( "${prefix/%//lib/pkgconfig}" "${prefix/%//share/pkgconfig}" ) > +libdir=( $(find ${prefix} -maxdepth 3 -type d -name pkgconfig) ) > system_libpath=( "${libdir[@]/%//../../lib}" "${libdir[@]/%//../lib}" "/usr/lib" "/lib" ) > system_incpath=( "${libdir[@]/%//../../include}" "${libdir[@]/%//../include}" "/usr/include" "/include" ) > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de