From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] Resolve lib and pkgconfig dirs dynamically.
Date: Fri, 7 May 2021 08:07:06 +0200 [thread overview]
Message-ID: <20210507060706.3947186-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210426210311.18897-1-christian.melki@t2data.com>
Thanks, applied as 842b1b8e87c39ad2f727594d5e52441337a6c5d1.
Michael
[sent from post-receive hook]
On Fri, 07 May 2021 08:07:05 +0200, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20210426210311.18897-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
prev parent reply other threads:[~2021-05-07 6:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 21:03 [ptxdist] [PATCH] " Christian Melki
2021-05-07 6:07 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210507060706.3947186-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox