Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/
Date: Tue, 11 Jan 2022 17:24:48
Message-Id: 1641921880.fed23dc429a6bc291fc4d16c9abc28d84cc71344.vapier@gentoo
1 commit: fed23dc429a6bc291fc4d16c9abc28d84cc71344
2 Author: Tom Shafron <shafron <AT> google <DOT> com>
3 AuthorDate: Tue Jan 11 17:21:21 2022 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 17:24:40 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed23dc4
7
8 dev-libs/nspr: respect $AS settings
9
10 Signed-off-by: Tom Shafron <shafron <AT> google.com>
11 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
12
13 dev-libs/nspr/nspr-4.32.ebuild | 3 ++-
14 dev-libs/nspr/nspr-4.33.ebuild | 3 ++-
15 2 files changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-libs/nspr/nspr-4.32.ebuild b/dev-libs/nspr/nspr-4.32.ebuild
18 index d6db3c7ef9ee..7be0ae41e449 100644
19 --- a/dev-libs/nspr/nspr-4.32.ebuild
20 +++ b/dev-libs/nspr/nspr-4.32.ebuild
21 @@ -60,7 +60,7 @@ multilib_src_configure() {
22 # We use the standard BUILD_xxx but nspr uses HOST_xxx
23 tc-export_build_env BUILD_CC
24 export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
25 - tc-export AR CC CXX RANLIB
26 + tc-export AR AS CC CXX RANLIB
27 [[ ${CBUILD} != ${CHOST} ]] \
28 && export CROSS_COMPILE=1 \
29 || unset CROSS_COMPILE
30 @@ -98,6 +98,7 @@ multilib_src_configure() {
31 # Ancient autoconf needs help finding the right tools.
32 LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
33 ac_cv_path_AR="${AR}" \
34 + ac_cv_path_AS="${AS}" \
35 econf "${myconf[@]}"
36 }
37
38
39 diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
40 index c0dd76d1aa2e..3f4ceb883969 100644
41 --- a/dev-libs/nspr/nspr-4.33.ebuild
42 +++ b/dev-libs/nspr/nspr-4.33.ebuild
43 @@ -60,7 +60,7 @@ multilib_src_configure() {
44 # We use the standard BUILD_xxx but nspr uses HOST_xxx
45 tc-export_build_env BUILD_CC
46 export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
47 - tc-export AR CC CXX RANLIB
48 + tc-export AR AS CC CXX RANLIB
49 [[ ${CBUILD} != ${CHOST} ]] \
50 && export CROSS_COMPILE=1 \
51 || unset CROSS_COMPILE
52 @@ -98,6 +98,7 @@ multilib_src_configure() {
53 # Ancient autoconf needs help finding the right tools.
54 LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
55 ac_cv_path_AR="${AR}" \
56 + ac_cv_path_AS="${AS}" \
57 econf "${myconf[@]}"
58 }