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_0.4.1.bb | |
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_0.4.1.bb')
-rw-r--r-- | meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | 7 |
1 files changed, 4 insertions, 3 deletions
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" | |||
11 | DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" | 11 | DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" |
12 | 12 | ||
13 | SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ | 13 | SRC_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 | ||
17 | SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" | 16 | SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" |
@@ -19,9 +18,11 @@ SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2 | |||
19 | 18 | ||
20 | inherit autotools pkgconfig allarch gtk-icon-cache perlnative | 19 | inherit autotools pkgconfig allarch gtk-icon-cache perlnative |
21 | 20 | ||
22 | FILES_${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. | ||
23 | export PKG_CONFIG = "pkg-config-native" | ||
23 | 24 | ||
24 | EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping" | 25 | FILES_${PN} += "${datadir}/icons/Sato" |
25 | 26 | ||
26 | do_install_append() { | 27 | do_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 \; |