diff options
author | Ross Burton <ross.burton@intel.com> | 2013-12-11 17:34:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 23:10:56 +0000 |
commit | 6b124ff57eda9af541e61f5e0e8a895de1e58e3a (patch) | |
tree | 51a3f8ec71b039e866218a76300eb3e52090a8d6 /meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch | |
parent | 07ce0296bbc4c09469ae13bf9f91d19496b60cc6 (diff) | |
download | poky-6b124ff57eda9af541e61f5e0e8a895de1e58e3a.tar.gz |
sato-icon-theme: simplify icon-name-mapping lookup
Patching an option into configure.ac and then running sed over path variables is
fragile as the definition of $libexecdir can and has changed.
Instead, tell configure to use our pkg-config-native wrapper when it uses
pkg-config, and it will find the right binaries without any further munging.
(From OE-Core rev: 81cfade0615ac1e52a4185b1dcaab7ad78a9e6fd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch')
-rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch deleted file mode 100644 index b392a932ae..0000000000 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | pkg-config will only search the target sysroot and we want the native script. This | ||
2 | patch adds an option to allow the path to the tool to be specified. | ||
3 | |||
4 | RP - 12/8/10 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: sato-icon-theme-0.4.1/configure.ac | ||
9 | =================================================================== | ||
10 | --- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100 | ||
11 | +++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100 | ||
12 | @@ -11,20 +11,29 @@ | ||
13 | |||
14 | UTILS_REQUIRED=0.8.2 | ||
15 | |||
16 | -AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) | ||
17 | -PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, | ||
18 | - have_utils=yes, have_utils=no) | ||
19 | -if test "x$have_utils" = "xyes"; then | ||
20 | - UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" | ||
21 | - ICONMAP="$UTILS_PATH/icon-name-mapping" | ||
22 | - AC_SUBST(ICONMAP) | ||
23 | - AC_MSG_RESULT([yes]) | ||
24 | -else | ||
25 | - AC_MSG_RESULT([no]) | ||
26 | - AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build | ||
27 | - and install sato-icon-theme]) | ||
28 | +PKG_PROG_PKG_CONFIG() | ||
29 | + | ||
30 | +AC_ARG_WITH(iconmap, | ||
31 | + AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]), | ||
32 | + ICONMAP=$withval, ICONMAP="") | ||
33 | + | ||
34 | +if test "x$ICONMAP" = "x"; then | ||
35 | + AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) | ||
36 | + PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, | ||
37 | + have_utils=yes, have_utils=no) | ||
38 | + if test "x$have_utils" = "xyes"; then | ||
39 | + UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" | ||
40 | + ICONMAP="$UTILS_PATH/icon-name-mapping" | ||
41 | + | ||
42 | + AC_MSG_RESULT([yes]) | ||
43 | + else | ||
44 | + AC_MSG_RESULT([no]) | ||
45 | + AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build | ||
46 | + and install sato-icon-theme]) | ||
47 | + fi | ||
48 | fi | ||
49 | |||
50 | +AC_SUBST(ICONMAP) | ||
51 | |||
52 | AC_CONFIG_FILES([ | ||
53 | Makefile | ||