From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] pkgconf: make wrapper relocatable
Date: Wed, 09 Mar 2016 14:46:29 +0100 [thread overview]
Message-ID: <87egbj228a.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <1457529409-24102-1-git-send-email-gustavo@zacarias.com.ar> (Gustavo Zacarias's message of "Wed, 9 Mar 2016 10:16:49 -0300")
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> Use shell ${STAGING_DIR} to expand at run time instead of build time
> hence avoiding hardcoding the staging directory in it and making it
> relocatable.
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Ehh, doesn't this break using pkg-config outside buildroot?
> ---
> package/pkgconf/pkg-config.in | 2 +-
> package/pkgconf/pkgconf.mk | 3 ---
> 2 files changed, 1 insertion(+), 4 deletions(-)
> diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
> index 4dec487..51ac8c1 100644
> --- a/package/pkgconf/pkg-config.in
> +++ b/package/pkgconf/pkg-config.in
> @@ -1,2 +1,2 @@
> #!/bin/sh
> -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:- at PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:- at STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@
> +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${STAGING_DIR}/usr/lib/pkgconfig:${STAGING_DIR}/usr/share/pkgconfig} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${STAGING_DIR}} $(dirname $0)/pkgconf @STATIC@ $@
> diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
> index c8b0cba..3cfcc2a 100644
> --- a/package/pkgconf/pkgconf.mk
> +++ b/package/pkgconf/pkgconf.mk
> @@ -19,9 +19,6 @@ endef
> define HOST_PKGCONF_INSTALL_WRAPPER
> $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
> $(HOST_DIR)/usr/bin/pkg-config
> - $(SED) 's, at PKG_CONFIG_LIBDIR@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \
> - -e 's, at STAGING_DIR@,$(STAGING_DIR),' \
> - $(HOST_DIR)/usr/bin/pkg-config
> endef
> define HOST_PKGCONF_STATIC
> --
> 2.4.10
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2016-03-09 13:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 13:16 [Buildroot] [PATCH] pkgconf: make wrapper relocatable Gustavo Zacarias
2016-03-09 13:46 ` Peter Korsgaard [this message]
2016-03-09 13:51 ` Gustavo Zacarias
2016-03-09 14:00 ` Peter Korsgaard
2016-03-09 14:04 ` Gustavo Zacarias
2016-03-09 14:31 ` Peter Korsgaard
2016-03-09 14:37 ` Arnout Vandecappelle
2016-03-09 14:40 ` Gustavo Zacarias
2016-03-09 14:46 ` Peter Korsgaard
2016-03-09 14:52 ` Arnout Vandecappelle
2016-03-09 15:06 ` Peter Korsgaard
2016-03-09 14:03 ` Thomas Petazzoni
2016-03-09 14:28 ` Gustavo Zacarias
2016-03-09 14:40 ` Arnout Vandecappelle
2016-03-09 14:41 ` Gustavo Zacarias
2016-03-09 14:42 ` Arnout Vandecappelle
2016-03-09 14:30 ` Peter Korsgaard
2016-03-09 14:50 ` Thomas Petazzoni
2016-03-09 14:55 ` Peter Korsgaard
2016-03-09 15:22 ` Samuel Martin
2016-03-09 15:55 ` Peter Korsgaard
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=87egbj228a.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/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