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 078AE13835A for ; Tue, 16 Feb 2021 18:39:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AB29E085A; Tue, 16 Feb 2021 18:39:39 +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 45498E085A for ; Tue, 16 Feb 2021 18:39:39 +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 56EAF3412E9 for ; Tue, 16 Feb 2021 18:39:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9635D4E9 for ; Tue, 16 Feb 2021 18:39:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1613500771.42dcbd54456d28b73432bbf4be11f14f36f5d342.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx-unit/nginx-unit-1.22.0.ebuild X-VCS-Directories: www-servers/nginx-unit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 42dcbd54456d28b73432bbf4be11f14f36f5d342 X-VCS-Branch: master Date: Tue, 16 Feb 2021 18:39:35 +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: ce399c8c-d4dd-47c9-89c8-e97be614e223 X-Archives-Hash: da989fbd6bd9e8b26c094b9af49d8bf9 commit: 42dcbd54456d28b73432bbf4be11f14f36f5d342 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 18:30:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 16 18:39:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42dcbd54 www-servers/nginx-unit: minor style changes Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> www-servers/nginx-unit/nginx-unit-1.22.0.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild index b0456d58154..faa05dcce8d 100644 --- a/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild +++ b/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=(python3_{7,8,9}) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit flag-o-matic python-single-r1 toolchain-funcs @@ -11,6 +11,7 @@ MY_P="unit-${PV}" DESCRIPTION="Dynamic web and application server" HOMEPAGE="https://unit.nginx.org" SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0" SLOT="0" @@ -32,7 +33,6 @@ DEPEND="perl? ( dev-lang/perl:= ) ) ssl? ( dev-libs/openssl:0 )" RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" pkg_setup() { use python && python-single-r1_pkg_setup @@ -52,17 +52,21 @@ src_configure() { --prefix=/usr --state=/var/lib/${PN} ) + use ssl && opt+=( --openssl ) export AR="$(tc-getAR)" export CC="$(tc-getCC)" ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" + # Modules require position-independent code append-cflags $(test-flags-CC -fPIC) + for flag in ${MY_USE} ; do if use ${flag} ; then ./configure ${flag} || die "Module configuration failed: ${flag}" fi done + for flag in ${MY_USE_PHP} ; do if use ${flag} ; then local php_slot="/usr/$(get_libdir)/${flag/-/.}" @@ -76,6 +80,7 @@ src_configure() { src_install() { default + diropts -m 0770 keepdir /var/lib/${PN} newinitd "${FILESDIR}/${PN}.initd" ${PN}