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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AA0015808B for ; Sat, 19 Mar 2022 22:39:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D744E08C3; Sat, 19 Mar 2022 22:39:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C60EEE084A for ; Sat, 19 Mar 2022 22:39:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A45A2343838 for ; Sat, 19 Mar 2022 22:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2342D32E for ; Sat, 19 Mar 2022 22:39:19 +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: <1647729544.96fe1038c5e07c43aecac821a9f078abdc612dde.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.6.1.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 96fe1038c5e07c43aecac821a9f078abdc612dde X-VCS-Branch: master Date: Sat, 19 Mar 2022 22:39:19 +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: 6ef93c54-8df3-4c1b-ac8f-0427f4d9673e X-Archives-Hash: b6ffef924b5a35a94ffb4ca172852f7e commit: 96fe1038c5e07c43aecac821a9f078abdc612dde Author: Sam James gentoo org> AuthorDate: Sat Mar 19 22:36:37 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 19 22:39:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fe1038 net-nds/openldap: fix tc-getCC quoting Breaks build otherwise for e.g. ABI_X86_32: ``` >>> Compiling source in /var/tmp/portage/net-nds/openldap-2.6.1/work/openldap-OPENLDAP_REL_ENG_2_6_1 ... * abi_x86_32.x86: running multilib-minimal_abi_src_compile make -j32 -l32 CC=x86_64-pc-linux-gnu-gcc -m32 SHELL=/bin/sh make: invalid option -- '3' make: invalid option -- '2' Usage: make [options] [target] ... Options: ``` Signed-off-by: Sam James gentoo.org> net-nds/openldap/openldap-2.6.1.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net-nds/openldap/openldap-2.6.1.ebuild b/net-nds/openldap/openldap-2.6.1.ebuild index 0e0449e3885e..04bd86b1b15b 100644 --- a/net-nds/openldap/openldap-2.6.1.ebuild +++ b/net-nds/openldap/openldap-2.6.1.ebuild @@ -144,7 +144,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-cloak.patch "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch - "${FILESDIR}"/${PN}-2.6.1-make-flags.patch ) openldap_filecount() { @@ -515,7 +514,7 @@ src_configure_cxx() { multilib_src_compile() { tc-export AR CC CXX - emake CC=$(tc-getCC) SHELL="${EPREFIX}"/bin/sh + emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh if ! use minimal && multilib_is_native_abi ; then if use cxx ; then @@ -554,7 +553,7 @@ multilib_src_compile() { emake \ LDAP_BUILD="${BUILD_DIR}" \ - CC=$(tc-getCC) libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap + CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" popd &>/dev/null || die fi @@ -616,7 +615,7 @@ multilib_src_test() { } multilib_src_install() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install if ! use minimal && multilib_is_native_abi; then