[Buildroot] [PATCH] pkgconf: make wrapper relocatable
Peter Korsgaard
peter at korsgaard.com
Wed Mar 9 13:46:29 UTC 2016
>>>>> "Gustavo" == Gustavo Zacarias <gustavo at 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 at 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
More information about the buildroot
mailing list