[gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/

[Jason Donenfeld]

commit:     cf789f317bc8993cbde9828124924c83e3cabe57
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 13:15:19 2017 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:15:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf789f31

net-vpn/wireguard: evaluate KERNEL_DIR later

The linux-info eclass might do some things to it during other
phases, so we want to evaluate it quite late.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-vpn/wireguard/wireguard-0.0.20170629.ebuild | 2 +-
 net-vpn/wireguard/wireguard-9999.ebuild         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/wireguard/wireguard-0.0.20170629.ebuild 
b/net-vpn/wireguard/wireguard-0.0.20170629.ebuild
index 2ffe26d5db5..0f1b5d07cb7 100644
--- a/net-vpn/wireguard/wireguard-0.0.20170629.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20170629.ebuild
@@ -26,7 +26,6 @@ DEPEND="tools? ( net-libs/libmnl )"
 RDEPEND="${DEPEND}"
 
 MODULE_NAMES="wireguard(net:src)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
 BUILD_TARGETS="module"
 CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER ~PADATA"
 WARNING_PADATA="If you're running a multicore system you likely should enable 
CONFIG_PADATA for improved performance and parallel crypto."
@@ -39,6 +38,7 @@ pkg_setup() {
 }
 
 src_compile() {
+       BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
        use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools

diff --git a/net-vpn/wireguard/wireguard-9999.ebuild 
b/net-vpn/wireguard/wireguard-9999.ebuild
index 2ffe26d5db5..0f1b5d07cb7 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -26,7 +26,6 @@ DEPEND="tools? ( net-libs/libmnl )"
 RDEPEND="${DEPEND}"
 
 MODULE_NAMES="wireguard(net:src)"
-BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
 BUILD_TARGETS="module"
 CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER ~PADATA"
 WARNING_PADATA="If you're running a multicore system you likely should enable 
CONFIG_PADATA for improved performance and parallel crypto."
@@ -39,6 +38,7 @@ pkg_setup() {
 }
 
 src_compile() {
+       BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
        use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools