code.ossystems Code Review - openembedded-core.git/blob

   1 From e08b3677dd04d6ec407ba8f74f601b2d51310eff Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Thu, 8 Oct 2015 18:30:35 +0300
   4 Subject: [PATCH 5/5] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
   5  environment variable
   6
   7 This environment variable sets the location of sysroot directory in cross-compilation
   8 environments; if the variable is not set, the prefix will be empty.
   9
  10 Upstream-Status: Pending [review on oe-core list]
  11 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  12 ---
  13  Makefile-gir.am     | 18 +++++++++---------
  14  m4/introspection.m4 |  8 ++++----
  15  2 files changed, 13 insertions(+), 13 deletions(-)
  16
  17 diff --git a/Makefile-gir.am b/Makefile-gir.am
  18 index a09260a..ba6e89e 100644
  19 --- a/Makefile-gir.am
  20 +++ b/Makefile-gir.am
  21 @@ -55,8 +55,8 @@ else
  22  endif
  23
  24  # glib
  25 -GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
  26 -GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
  27 +GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
  28 +GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
  29
  30  GLIB_LIBRARY=glib-2.0
  31
  32 @@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
  33  gir/DBusGLib-1.0.typelib: GObject-2.0.gir
  34
  35  # gobject
  36 -GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
  37 -GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
  38 +GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
  39 +GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
  40
  41  GOBJECT_LIBRARY=gobject-2.0
  42
  43 @@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \
  44  BUILT_GIRSOURCES += GObject-2.0.gir
  45
  46  # gmodule
  47 -GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
  48 -GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
  49 +GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
  50 +GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
  51
  52  GMODULE_LIBRARY=gmodule-2.0
  53
  54 @@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
  55  BUILT_GIRSOURCES += GModule-2.0.gir
  56
  57  # gio
  58 -GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
  59 -GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
  60 +GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
  61 +GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
  62
  63  GIO_LIBRARY=gio-2.0
  64
  65  if HAVE_GIO_UNIX
  66 -GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
  67 +GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
  68  GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h
  69  GIO_UNIX_PACKAGES = gio-unix-2.0
  70  else
  71 diff --git a/m4/introspection.m4 b/m4/introspection.m4
  72 index d89c3d9..b562266 100644
  73 --- a/m4/introspection.m4
  74 +++ b/m4/introspection.m4
  75 @@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
  76      INTROSPECTION_GIRDIR=
  77      INTROSPECTION_TYPELIBDIR=
  78      if test "x$found_introspection" = "xyes"; then
  79 -       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  80 -       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  81 -       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  82 +       INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  83 +       INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  84 +       INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  85         INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
  86         INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  87         INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
  88         INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
  89 -       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  90 +       INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  91      fi
  92      AC_SUBST(INTROSPECTION_SCANNER)
  93      AC_SUBST(INTROSPECTION_COMPILER)
  94 --
  95 2.7.0
  96