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 22:31:59 +0000 |
| commit | 81cfade0615ac1e52a4185b1dcaab7ad78a9e6fd (patch) | |
| tree | 1cf4b6a07a026f5c06378c1cebfc0fc017d15422 /meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | |
| parent | 7603b15415301679bccbcb89af688c211704a43a (diff) | |
| download | openembedded-core-81cfade0615ac1e52a4185b1dcaab7ad78a9e6fd.tar.gz openembedded-core-81cfade0615ac1e52a4185b1dcaab7ad78a9e6fd.tar.bz2 openembedded-core-81cfade0615ac1e52a4185b1dcaab7ad78a9e6fd.zip | |
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.
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" DEPENDS = "icon-naming-utils-native libxml-simple-perl-native" SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ - file://iconpath-option.patch \ file://0001-Inherit-the-GNOME-icon-theme.patch" SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" @@ -19,9 +18,11 @@ SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2 inherit autotools pkgconfig allarch gtk-icon-cache perlnative -FILES_${PN} += "${datadir}" +# The configure script uses pkg-config to find native binaries to execute, so +# tell it to use our pkg-config-native wrapper. +export PKG_CONFIG = "pkg-config-native" -EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping" +FILES_${PN} += "${datadir}/icons/Sato" do_install_append() { find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \; |