| 1 |
commit: 347ce2c59f01431a937f8a56c2a6277a85597287 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 25 18:19:24 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 25 20:40:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347ce2c5 |
| 7 |
|
| 8 |
net-libs/libproxy: fix configure warnings |
| 9 |
|
| 10 |
Explicitely disable NATUS support, bug #624274. |
| 11 |
Do not pass unneeded variables if corresponding support is not enabled (perl, mono), bug #649454. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/649454 |
| 14 |
Closes: https://bugs.gentoo.org/624274 |
| 15 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 16 |
|
| 17 |
net-libs/libproxy/libproxy-0.4.13-r2.ebuild | 7 ++++--- |
| 18 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild |
| 21 |
index d212bc6f1b1..d5e475e1e5c 100644 |
| 22 |
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild |
| 23 |
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -61,13 +61,13 @@ PATCHES=( |
| 31 |
|
| 32 |
multilib_src_configure() { |
| 33 |
local mycmakeargs=( |
| 34 |
- '-DPERL_VENDORINSTALL=ON' |
| 35 |
+ "$(multilib_is_native_abi && usex perl -DPERL_VENDORINSTALL=ON)" |
| 36 |
# WITH_VALA just copies the .vapi file over and needs no deps, |
| 37 |
# hence always enable it unconditionally |
| 38 |
'-DWITH_VALA=ON' |
| 39 |
"-DCMAKE_C_FLAGS=${CFLAGS}" |
| 40 |
"-DCMAKE_CXX_FLAGS=${CXXFLAGS}" |
| 41 |
- "-DGMCS_EXECUTABLE='${EPREFIX}/usr/bin/mcs'" |
| 42 |
+ "$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}/usr/bin/mcs")" |
| 43 |
"-DWITH_GNOME3=$(usex gnome)" |
| 44 |
"-DWITH_KDE=$(usex kde)" |
| 45 |
"-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo 'OFF')" |
| 46 |
@@ -75,6 +75,7 @@ multilib_src_configure() { |
| 47 |
"-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo 'OFF')" |
| 48 |
"-DWITH_PYTHON=$(multilib_is_native_abi && usex python || echo 'OFF')" |
| 49 |
"-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')" |
| 50 |
+ "-DWITH_NATUS=OFF" |
| 51 |
"-DWITH_WEBKIT=OFF" |
| 52 |
"-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')" |
| 53 |
"-DBUILD_TESTING=$(usex test)" |
Archives