Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
Date: Fri, 09 Oct 2020 15:57:12
Message-Id: 1602259025.873d3aabf93c8b03ac7a2fdd17ea73b39f838676.zlogene@gentoo
1 commit: 873d3aabf93c8b03ac7a2fdd17ea73b39f838676
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 15:56:15 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 15:57:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873d3aab
7
8 net-nds/openldap: Do not hardcode bash
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 net-nds/openldap/openldap-2.4.50.ebuild | 6 +++---
14 net-nds/openldap/openldap-2.4.53.ebuild | 6 +++---
15 2 files changed, 6 insertions(+), 6 deletions(-)
16
17 diff --git a/net-nds/openldap/openldap-2.4.50.ebuild b/net-nds/openldap/openldap-2.4.50.ebuild
18 index 71320172f0b..2c5a8f5c18c 100644
19 --- a/net-nds/openldap/openldap-2.4.50.ebuild
20 +++ b/net-nds/openldap/openldap-2.4.50.ebuild
21 @@ -514,7 +514,7 @@ multilib_src_configure() {
22 done
23
24 tc-export AR CC CXX
25 - CONFIG_SHELL="/bin/bash" \
26 + CONFIG_SHELL="/bin/sh" \
27 ECONF_SOURCE="${S}" \
28 STRIP=/bin/true \
29 econf \
30 @@ -548,7 +548,7 @@ src_configure_cxx() {
31
32 multilib_src_compile() {
33 tc-export AR CC CXX
34 - emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
35 + emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
36 local lt="${BUILD_DIR}/libtool"
37 export echo="echo"
38
39 @@ -730,7 +730,7 @@ multilib_src_test() {
40
41 multilib_src_install() {
42 local lt="${BUILD_DIR}/libtool"
43 - emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
44 + emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
45
46 if ! use minimal && multilib_is_native_abi; then
47 # openldap modules go here
48
49 diff --git a/net-nds/openldap/openldap-2.4.53.ebuild b/net-nds/openldap/openldap-2.4.53.ebuild
50 index 89a4da0e820..759f1545776 100644
51 --- a/net-nds/openldap/openldap-2.4.53.ebuild
52 +++ b/net-nds/openldap/openldap-2.4.53.ebuild
53 @@ -514,7 +514,7 @@ multilib_src_configure() {
54 done
55
56 tc-export AR CC CXX
57 - CONFIG_SHELL="/bin/bash" \
58 + CONFIG_SHELL="/bin/sh" \
59 ECONF_SOURCE="${S}" \
60 STRIP=/bin/true \
61 econf \
62 @@ -548,7 +548,7 @@ src_configure_cxx() {
63
64 multilib_src_compile() {
65 tc-export AR CC CXX
66 - emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
67 + emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
68 local lt="${BUILD_DIR}/libtool"
69 export echo="echo"
70
71 @@ -730,7 +730,7 @@ multilib_src_test() {
72
73 multilib_src_install() {
74 local lt="${BUILD_DIR}/libtool"
75 - emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
76 + emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
77
78 if ! use minimal && multilib_is_native_abi; then
79 # openldap modules go here