summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-11 17:34:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 23:10:56 +0000
commit6b124ff57eda9af541e61f5e0e8a895de1e58e3a (patch)
tree51a3f8ec71b039e866218a76300eb3e52090a8d6 /meta/recipes-sato
parent07ce0296bbc4c09469ae13bf9f91d19496b60cc6 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch53
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb7
2 files changed, 4 insertions, 56 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 @@
1pkg-config will only search the target sysroot and we want the native script. This
2patch adds an option to allow the path to the tool to be specified.
3
4RP - 12/8/10
5
6Upstream-Status: Pending
7
8Index: 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
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index cf23aebf5e..a32e1a98e3 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -11,7 +11,6 @@ PR = "r6"
11DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" 11DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
12 12
13SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ 13SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
14 file://iconpath-option.patch \
15 file://0001-Inherit-the-GNOME-icon-theme.patch" 14 file://0001-Inherit-the-GNOME-icon-theme.patch"
16 15
17SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" 16SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
@@ -19,9 +18,11 @@ SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2
19 18
20inherit autotools pkgconfig allarch gtk-icon-cache perlnative 19inherit autotools pkgconfig allarch gtk-icon-cache perlnative
21 20
22FILES_${PN} += "${datadir}" 21# The configure script uses pkg-config to find native binaries to execute, so
22# tell it to use our pkg-config-native wrapper.
23export PKG_CONFIG = "pkg-config-native"
23 24
24EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping" 25FILES_${PN} += "${datadir}/icons/Sato"
25 26
26do_install_append() { 27do_install_append() {
27 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; 28 find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;