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 | |
| parent | 07ce0296bbc4c09469ae13bf9f91d19496b60cc6 (diff) | |
| download | ast2050-yocto-poky-6b124ff57eda9af541e61f5e0e8a895de1e58e3a.zip ast2050-yocto-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')
| -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 b392a93..0000000 --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -pkg-config will only search the target sysroot and we want the native script. This -patch adds an option to allow the path to the tool to be specified. - -RP - 12/8/10 - -Upstream-Status: Pending - -Index: sato-icon-theme-0.4.1/configure.ac -=================================================================== ---- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100 -+++ sato-icon-theme-0.4.1/configure.ac 2010-08-12 12:48:14.000000000 +0100 -@@ -11,20 +11,29 @@ - - UTILS_REQUIRED=0.8.2 - --AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) --PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, -- have_utils=yes, have_utils=no) --if test "x$have_utils" = "xyes"; then -- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -- ICONMAP="$UTILS_PATH/icon-name-mapping" -- AC_SUBST(ICONMAP) -- AC_MSG_RESULT([yes]) --else -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build -- and install sato-icon-theme]) -+PKG_PROG_PKG_CONFIG() -+ -+AC_ARG_WITH(iconmap, -+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]), -+ ICONMAP=$withval, ICONMAP="") -+ -+if test "x$ICONMAP" = "x"; then -+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED]) -+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED, -+ have_utils=yes, have_utils=no) -+ if test "x$have_utils" = "xyes"; then -+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`" -+ ICONMAP="$UTILS_PATH/icon-name-mapping" -+ -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build -+ and install sato-icon-theme]) -+ fi - fi - -+AC_SUBST(ICONMAP) - - AC_CONFIG_FILES([ - Makefile |
