diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-31 16:24:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:48:33 +0100 |
commit | 30dc71d7567fd8b65604da0e2656219016e607b5 (patch) | |
tree | 5959d37ca8fc72449bd32e369d7c9f5c636d8ebb /meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch | |
parent | 89118a364e1205e6cf647da0eb6215b3c02c76ab (diff) | |
download | poky-30dc71d7567fd8b65604da0e2656219016e607b5.tar.gz |
gnome-icon-theme: remove the recipe
It is not used by anything in oe-core and will be moved to meta-gnome
(From OE-Core rev: 9dde1ce547c8be064ff63ac832f62a08a9b00f10)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 28 |
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 @@ | |||
1 | icon-naming-utils is a native dependency so we need to use the native pkg-config | ||
2 | to find it. Simply perform the old switcheroonie on $PKG_CONFIG so | ||
3 | pkg-config-native is used temporarily. | ||
4 | |||
5 | Upstream-Status: Inappropriate (OE-specific) | ||
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
7 | |||
8 | diff --git a/configure.ac b/configure.ac | ||
9 | index 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 | ||