mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

libproxy: remove GPLv3 logic and spurious exports

Browse Source 
The GPLv3 logic was added back when gnome-common was GPLv3 but that has since
been fixed so the logic can be removed.

Also remove the export of HOST_SYS and BUILD_SYS (added in 397793) as cmake
works fine without them.

(From OE-Core rev: 71382cb226129c7991a82e37f3e8723042608546)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-02-09 16:34:02 +00:00
committed by Richard Purdie
parent 86994fdf6f
commit 3bdeda5437
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/libproxy/libproxy_0.4.11.bb
+1 -10
View File
@@ -17,11 +17,7 @@ SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe48
inherit cmake pkgconfig inherit cmake pkgconfig
PACKAGECONFIG ?= " \ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3"
${@ '' if incompatible_license_contains('GPLv3', 'x', '', d) == 'x' or bb.utils.contains('DISTRO_FEATURES', 'x11', 'x', '', d) == '' else 'gnome' } \
gnome3 \
"
PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf"
PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no"
@@ -36,10 +32,5 @@ EXTRA_OECMAKE += " \
-DLIBEXEC_INSTALL_DIR=${libexecdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \
" "
do_configure_prepend() {
export HOST_SYS=${HOST_SYS}
export BUILD_SYS=${BUILD_SYS}
}
FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" FILES_${PN} += "${libdir}/${BPN}/${PV}/modules"
FILES_${PN}-dev += "${datadir}/cmake" FILES_${PN}-dev += "${datadir}/cmake"