| 1 |
commit: eaaf15c342f2cd8e5a9eba89b63c300953449f6c |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jun 2 14:17:20 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 14:17:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eaaf15c3 |
| 7 |
|
| 8 |
sys-devel/gsl: also respect AR |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/849245 |
| 11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 12 |
|
| 13 |
sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch | 12 ++++++++++++ |
| 14 |
sys-devel/gsl/gsl-4.1.5-r1.ebuild | 2 +- |
| 15 |
2 files changed, 13 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch |
| 18 |
index 9d8ebb5f0..c3b5c89ee 100644 |
| 19 |
--- a/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch |
| 20 |
+++ b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch |
| 21 |
@@ -11,3 +11,15 @@ |
| 22 |
CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing" |
| 23 |
# We assume the following standard libraries are all present. |
| 24 |
# If your build is failing because of missing libraries then |
| 25 |
+@@ -334,9 +334,9 @@ |
| 26 |
+ AR_CREATE_OPT="c" |
| 27 |
+ fi |
| 28 |
+ if [ "$RANLIB" = "1" ]; then |
| 29 |
+- COMMAND="ar ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT" |
| 30 |
++ COMMAND="${AR} ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT" |
| 31 |
+ else |
| 32 |
+- COMMAND="ar ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT" |
| 33 |
++ COMMAND="${AR} ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT" |
| 34 |
+ fi |
| 35 |
+ if [ "$QUIET" = "no" ]; then |
| 36 |
+ if [ "$VERBOSE" = "no" ]; then |
| 37 |
|
| 38 |
diff --git a/sys-devel/gsl/gsl-4.1.5-r1.ebuild b/sys-devel/gsl/gsl-4.1.5-r1.ebuild |
| 39 |
index c42875214..2fd4ae01b 100644 |
| 40 |
--- a/sys-devel/gsl/gsl-4.1.5-r1.ebuild |
| 41 |
+++ b/sys-devel/gsl/gsl-4.1.5-r1.ebuild |
| 42 |
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" |
| 43 |
PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" ) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
- tc-export RANLIB |
| 47 |
+ tc-export AR RANLIB |
| 48 |
export CCNAME="$(tc-getCC)" |
| 49 |
export CCPLUS="$(tc-getCXX)" |
| 50 |
default |
Archives