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

   1 From a57604e205e6535acd9989444ad1f5f5038f4fba 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 1/4] 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 ---
  14  Makefile-gir.am     | 18 +++++++++---------
  15  m4/introspection.m4 |  8 ++++----
  16  2 files changed, 13 insertions(+), 13 deletions(-)
  17
  18 diff --git a/Makefile-gir.am b/Makefile-gir.am
  19 index 9aca664..09b9360 100644
  20 --- a/Makefile-gir.am
  21 +++ b/Makefile-gir.am
  22 @@ -55,8 +55,8 @@ else
  23  endif
  24
  25  # glib
  26 -GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
  27 -GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
  28 +GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
  29 +GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
  30
  31  GLIB_LIBRARY=glib-2.0
  32
  33 @@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
  34  gir/DBusGLib-1.0.typelib: GObject-2.0.gir
  35
  36  # gobject
  37 -GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
  38 -GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
  39 +GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
  40 +GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
  41
  42  GOBJECT_LIBRARY=gobject-2.0
  43
  44 @@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \
  45  BUILT_GIRSOURCES += GObject-2.0.gir
  46
  47  # gmodule
  48 -GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
  49 -GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
  50 +GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
  51 +GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
  52
  53  GMODULE_LIBRARY=gmodule-2.0
  54
  55 @@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
  56  BUILT_GIRSOURCES += GModule-2.0.gir
  57
  58  # gio
  59 -GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
  60 -GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
  61 +GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
  62 +GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
  63
  64  GIO_LIBRARY=gio-2.0
  65
  66  if HAVE_GIO_UNIX
  67 -GIO_UNIX_HDRS=$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
  68 +GIO_UNIX_HDRS=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
  69  GIO_UNIX_PACKAGES = gio-unix-2.0
  70  else
  71  GIO_UNIX_HDRS=
  72 diff --git a/m4/introspection.m4 b/m4/introspection.m4
  73 index d89c3d9..b562266 100644
  74 --- a/m4/introspection.m4
  75 +++ b/m4/introspection.m4
  76 @@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
  77      INTROSPECTION_GIRDIR=
  78      INTROSPECTION_TYPELIBDIR=
  79      if test "x$found_introspection" = "xyes"; then
  80 -       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  81 -       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  82 -       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  83 +       INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  84 +       INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  85 +       INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  86         INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
  87         INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  88         INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
  89         INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
  90 -       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  91 +       INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  92      fi
  93      AC_SUBST(INTROSPECTION_SCANNER)
  94      AC_SUBST(INTROSPECTION_COMPILER)
  95 --
  96 2.7.0
  97