From 6b124ff57eda9af541e61f5e0e8a895de1e58e3a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 11 Dec 2013 17:34:54 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb') 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 \; -- cgit v1.2.3-54-g00ecf