Gentoo Archives: gentoo-commits

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