diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/libproxy/libproxy_0.4.11.bb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb index 11a23b143f..8cc90bb8e7 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb | |||
@@ -17,11 +17,7 @@ SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe48 | |||
17 | 17 | ||
18 | inherit cmake pkgconfig | 18 | inherit cmake pkgconfig |
19 | 19 | ||
20 | PACKAGECONFIG ?= " \ | 20 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" |
21 | ${@ '' if incompatible_license_contains('GPLv3', 'x', '', d) == 'x' or bb.utils.contains('DISTRO_FEATURES', 'x11', 'x', '', d) == '' else 'gnome' } \ | ||
22 | gnome3 \ | ||
23 | " | ||
24 | |||
25 | PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" | 21 | PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" |
26 | PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" | 22 | PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" |
27 | 23 | ||
@@ -36,10 +32,5 @@ EXTRA_OECMAKE += " \ | |||
36 | -DLIBEXEC_INSTALL_DIR=${libexecdir} \ | 32 | -DLIBEXEC_INSTALL_DIR=${libexecdir} \ |
37 | " | 33 | " |
38 | 34 | ||
39 | do_configure_prepend() { | ||
40 | export HOST_SYS=${HOST_SYS} | ||
41 | export BUILD_SYS=${BUILD_SYS} | ||
42 | } | ||
43 | |||
44 | FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" | 35 | FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" |
45 | FILES_${PN}-dev += "${datadir}/cmake" | 36 | FILES_${PN}-dev += "${datadir}/cmake" |