| 1 |
commit: 6841381ab063576cf334e9f11b7d8500ebd5b696 |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 12 06:10:07 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 12 06:10:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6841381a |
| 7 |
|
| 8 |
dev-libs/nspr: respect $AS settings (revert revert) |
| 9 |
|
| 10 |
This reverts commit 773b7471a42cb6169f97264fe07d5de95f655cb3. |
| 11 |
|
| 12 |
- commit was reviewed and tested. |
| 13 |
- we'd like to work with the author(s) directly in future and not |
| 14 |
through hoops, it'd be healthier in longterm too. |
| 15 |
|
| 16 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-libs/nspr/nspr-4.32.ebuild | 3 ++- |
| 19 |
dev-libs/nspr/nspr-4.33.ebuild | 3 ++- |
| 20 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-libs/nspr/nspr-4.32.ebuild b/dev-libs/nspr/nspr-4.32.ebuild |
| 23 |
index d6db3c7ef9ee..7be0ae41e449 100644 |
| 24 |
--- a/dev-libs/nspr/nspr-4.32.ebuild |
| 25 |
+++ b/dev-libs/nspr/nspr-4.32.ebuild |
| 26 |
@@ -60,7 +60,7 @@ multilib_src_configure() { |
| 27 |
# We use the standard BUILD_xxx but nspr uses HOST_xxx |
| 28 |
tc-export_build_env BUILD_CC |
| 29 |
export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} |
| 30 |
- tc-export AR CC CXX RANLIB |
| 31 |
+ tc-export AR AS CC CXX RANLIB |
| 32 |
[[ ${CBUILD} != ${CHOST} ]] \ |
| 33 |
&& export CROSS_COMPILE=1 \ |
| 34 |
|| unset CROSS_COMPILE |
| 35 |
@@ -98,6 +98,7 @@ multilib_src_configure() { |
| 36 |
# Ancient autoconf needs help finding the right tools. |
| 37 |
LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ |
| 38 |
ac_cv_path_AR="${AR}" \ |
| 39 |
+ ac_cv_path_AS="${AS}" \ |
| 40 |
econf "${myconf[@]}" |
| 41 |
} |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild |
| 45 |
index c0dd76d1aa2e..3f4ceb883969 100644 |
| 46 |
--- a/dev-libs/nspr/nspr-4.33.ebuild |
| 47 |
+++ b/dev-libs/nspr/nspr-4.33.ebuild |
| 48 |
@@ -60,7 +60,7 @@ multilib_src_configure() { |
| 49 |
# We use the standard BUILD_xxx but nspr uses HOST_xxx |
| 50 |
tc-export_build_env BUILD_CC |
| 51 |
export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} |
| 52 |
- tc-export AR CC CXX RANLIB |
| 53 |
+ tc-export AR AS CC CXX RANLIB |
| 54 |
[[ ${CBUILD} != ${CHOST} ]] \ |
| 55 |
&& export CROSS_COMPILE=1 \ |
| 56 |
|| unset CROSS_COMPILE |
| 57 |
@@ -98,6 +98,7 @@ multilib_src_configure() { |
| 58 |
# Ancient autoconf needs help finding the right tools. |
| 59 |
LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ |
| 60 |
ac_cv_path_AR="${AR}" \ |
| 61 |
+ ac_cv_path_AS="${AS}" \ |
| 62 |
econf "${myconf[@]}" |
| 63 |
} |
Archives