From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DED5C1382C5 for ; Mon, 5 Apr 2021 13:45:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F797E087A; Mon, 5 Apr 2021 13:45:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB272E087A for ; Mon, 5 Apr 2021 13:45:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B09D335C7E for ; Mon, 5 Apr 2021 13:45:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B374DC3 for ; Mon, 5 Apr 2021 13:45:15 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1617630306.a5bdde32593614254a4946990cf350dc50e2407c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx/nginx-1.18.0-r2.ebuild www-servers/nginx/nginx-1.19.2-r1.ebuild www-servers/nginx/nginx-1.19.3.ebuild www-servers/nginx/nginx-1.19.4.ebuild www-servers/nginx/nginx-1.19.5-r1.ebuild www-servers/nginx/nginx-1.19.5.ebuild www-servers/nginx/nginx-1.19.6-r100.ebuild www-servers/nginx/nginx-1.19.6.ebuild www-servers/nginx/nginx-1.19.7.ebuild www-servers/nginx/nginx-1.19.8.ebuild www-servers/nginx/nginx-1.19.9.ebuild X-VCS-Directories: www-servers/nginx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a5bdde32593614254a4946990cf350dc50e2407c X-VCS-Branch: master Date: Mon, 5 Apr 2021 13:45:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11ccb3b0-fefb-495d-9057-39f60af2d817 X-Archives-Hash: cfe27f8f1c32d16e38326934e12a45e6 commit: a5bdde32593614254a4946990cf350dc50e2407c Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 5 01:50:05 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 5 13:45:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5bdde32 www-servers/nginx: avoid using EROOT in src_configure For EAPI 7, use ESYSROOT since these paths are used to locate headers and libraries to build against. For older EAPIs, approximate ESYSROOT as "${SYSROOT}${EPREFIX}". Signed-off-by: Mike Gilbert gentoo.org> www-servers/nginx/nginx-1.18.0-r2.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.2-r1.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.3.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.4.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.5-r1.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.5.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.6-r100.ebuild | 4 ++-- www-servers/nginx/nginx-1.19.6.ebuild | 6 +++--- www-servers/nginx/nginx-1.19.7.ebuild | 4 ++-- www-servers/nginx/nginx-1.19.8.ebuild | 4 ++-- www-servers/nginx/nginx-1.19.9.ebuild | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild index c4aa1254fc9..b8b349e004f 100644 --- a/www-servers/nginx/nginx-1.18.0-r2.ebuild +++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.2-r1.ebuild b/www-servers/nginx/nginx-1.19.2-r1.ebuild index a23f3375b04..d47ca62ec2e 100644 --- a/www-servers/nginx/nginx-1.19.2-r1.ebuild +++ b/www-servers/nginx/nginx-1.19.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.3.ebuild b/www-servers/nginx/nginx-1.19.3.ebuild index 2f271e65ba7..ce32ad30570 100644 --- a/www-servers/nginx/nginx-1.19.3.ebuild +++ b/www-servers/nginx/nginx-1.19.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.4.ebuild b/www-servers/nginx/nginx-1.19.4.ebuild index 2f271e65ba7..ce32ad30570 100644 --- a/www-servers/nginx/nginx-1.19.4.ebuild +++ b/www-servers/nginx/nginx-1.19.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.5-r1.ebuild b/www-servers/nginx/nginx-1.19.5-r1.ebuild index 46d444142cc..6faad622548 100644 --- a/www-servers/nginx/nginx-1.19.5-r1.ebuild +++ b/www-servers/nginx/nginx-1.19.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.5.ebuild b/www-servers/nginx/nginx-1.19.5.ebuild index 2f271e65ba7..ce32ad30570 100644 --- a/www-servers/nginx/nginx-1.19.5.ebuild +++ b/www-servers/nginx/nginx-1.19.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.6-r100.ebuild b/www-servers/nginx/nginx-1.19.6-r100.ebuild index 60f48de8f52..9b9833f08b8 100644 --- a/www-servers/nginx/nginx-1.19.6-r100.ebuild +++ b/www-servers/nginx/nginx-1.19.6-r100.ebuild @@ -683,8 +683,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}/usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}/usr/$(get_libdir)" \ + --with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.6.ebuild b/www-servers/nginx/nginx-1.19.6.ebuild index 46d444142cc..6faad622548 100644 --- a/www-servers/nginx/nginx-1.19.6.ebuild +++ b/www-servers/nginx/nginx-1.19.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -680,8 +680,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ + --with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${SYSROOT}${EPREFIX}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.7.ebuild b/www-servers/nginx/nginx-1.19.7.ebuild index 9b3d0583c9e..719ca29bc30 100644 --- a/www-servers/nginx/nginx-1.19.7.ebuild +++ b/www-servers/nginx/nginx-1.19.7.ebuild @@ -683,8 +683,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}/usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}/usr/$(get_libdir)" \ + --with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.8.ebuild b/www-servers/nginx/nginx-1.19.8.ebuild index ef29be90f4d..2b46bcc6508 100644 --- a/www-servers/nginx/nginx-1.19.8.ebuild +++ b/www-servers/nginx/nginx-1.19.8.ebuild @@ -683,8 +683,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}/usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}/usr/$(get_libdir)" \ + --with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ diff --git a/www-servers/nginx/nginx-1.19.9.ebuild b/www-servers/nginx/nginx-1.19.9.ebuild index 951ed700dca..11e748bc8c2 100644 --- a/www-servers/nginx/nginx-1.19.9.ebuild +++ b/www-servers/nginx/nginx-1.19.9.ebuild @@ -683,8 +683,8 @@ src_configure() { --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \ --pid-path="${EPREFIX}"/run/${PN}.pid \ --lock-path="${EPREFIX}"/run/lock/${PN}.lock \ - --with-cc-opt="-I${EROOT}/usr/include${WITHOUT_IPV6}" \ - --with-ld-opt="-L${EROOT}/usr/$(get_libdir)" \ + --with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \ + --with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \