[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/

[Sam James]

commit:     96fe1038c5e07c43aecac821a9f078abdc612dde
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 22:36:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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