summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch')
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
deleted file mode 100644
index 6139eaba0f..0000000000
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1icon-naming-utils is a native dependency so we need to use the native pkg-config
2to find it. Simply perform the old switcheroonie on $PKG_CONFIG so
3pkg-config-native is used temporarily.
4
5Upstream-Status: Inappropriate (OE-specific)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/configure.ac b/configure.ac
9index 6074f2c..3d38e49 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -40,6 +40,8 @@ if test "x$enable_mapping" != "xno"; then
13 UTILS_REQUIRED=0.8.7
14
15 AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
16+ save_PKG_CONFIG=$PKG_CONFIG
17+ PKG_CONFIG=pkg-config-native
18 PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
19 have_utils=yes, have_utils=no)
20 if test "x$have_utils" = "xyes"; then
21@@ -51,6 +53,7 @@ if test "x$enable_mapping" != "xno"; then
22 AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
23 and install gnome-icon-theme])
24 fi
25+ PKG_CONFIG=save_PKG_CONFIG
26 else
27 ICONMAP="false"
28 fi