[Buildroot] [PATCH 1/1] package/libglib2: remove bindir prefix from gio-2.0.pc

Adam Duskett aduskett at gmail.com
Tue Jun 11 18:19:00 UTC 2019


All;

Openembedded has a patch for this that might be even better for us to use:
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch

If not, then consider this an
Acked-by: Adam Duskett <aduskett at gmail.com>

On Tue, Jun 11, 2019 at 1:30 PM Fabrice Fontaine
<fontaine.fabrice at gmail.com> wrote:
>
> Apply LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE to gio-2.0.pc so
> ${bindir} prefix is also removed for gbus-codegen otherwise build of
> packages using this binary will fail if gbus-codegen is not installed on
> host
>
> Fixes:
>  - http://autobuild.buildroot.org/results/5c0e4f3d33e01198688d58388aabe159bd005234
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  package/libglib2/libglib2.mk | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index 78d6e5ab32..c8db706684 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -85,13 +85,17 @@ endef
>
>  LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
>
> -# Newer versions of libglib2 prefix glib-genmarshal, gobject-query, and
> -# glib-mkenums with ${bindir}. Unfortunately, this will resolve to the host
> -# systems /bin/ directory, which will cause compilation issues if the host does
> -# not have these programs. By removing the ${bindir}/ prefix, these programs
> -# are resolved in PATH instead.
> +# Newer versions of libglib2 prefix glib-genmarshal, gobject-query,
> +# glib-mkenums, glib_compile_schemas, glib_compile_resources and gdbus-codegen
> +# with ${bindir}. Unfortunately, this will resolve to the host systems /bin/
> +# directory, which will cause compilation issues if the host does not have these
> +# programs. By removing the ${bindir}/ prefix, these programs are resolved in
> +# PATH instead.
>  define LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE
> -       $(SED) 's%$${bindir}/%%g' $(STAGING_DIR)/usr/lib/pkgconfig/glib-2.0.pc
> +       for file in glib-2.0.pc gio-2.0.pc ; do \
> +               $(SED) 's%$${bindir}/%%g' \
> +                       $(STAGING_DIR)/usr/lib/pkgconfig/$$file ; \
> +       done
>  endef
>  LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE
>
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot


More information about the buildroot mailing list