aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Barbieri <lssndrbarbieri@gmail.com>2022-06-02 16:17:20 +0200
committerAlessandro Barbieri <lssndrbarbieri@gmail.com>2022-06-02 16:17:20 +0200
commiteaaf15c342f2cd8e5a9eba89b63c300953449f6c (patch)
tree1d288ba8b106171ae2232012df9538cdb0a899c3
parentsys-cluster/OpenHPC-meta: add osu-micro-benchmarks (diff)
downloadguru-eaaf15c3.tar.gz
guru-eaaf15c3.tar.bz2
guru-eaaf15c3.zip
sys-devel/gsl: also respect AR
Closes: https://bugs.gentoo.org/849245 Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
-rw-r--r--sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch12
-rw-r--r--sys-devel/gsl/gsl-4.1.5-r1.ebuild2
2 files changed, 13 insertions, 1 deletions
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
index 9d8ebb5f0..c3b5c89ee 100644
--- a/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch
+++ b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch
@@ -11,3 +11,15 @@
CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing"
# We assume the following standard libraries are all present.
# If your build is failing because of missing libraries then
+@@ -334,9 +334,9 @@
+ AR_CREATE_OPT="c"
+ fi
+ if [ "$RANLIB" = "1" ]; then
+- COMMAND="ar ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT"
++ COMMAND="${AR} ${AR_CREATE_OPT}r $LIBNAME.a $OBJECT"
+ else
+- COMMAND="ar ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT"
++ COMMAND="${AR} ${AR_CREATE_OPT}rs $LIBNAME.a $OBJECT"
+ fi
+ if [ "$QUIET" = "no" ]; then
+ if [ "$VERBOSE" = "no" ]; then
diff --git a/sys-devel/gsl/gsl-4.1.5-r1.ebuild b/sys-devel/gsl/gsl-4.1.5-r1.ebuild
index c42875214..2fd4ae01b 100644
--- a/sys-devel/gsl/gsl-4.1.5-r1.ebuild
+++ b/sys-devel/gsl/gsl-4.1.5-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
src_prepare() {
- tc-export RANLIB
+ tc-export AR RANLIB
export CCNAME="$(tc-getCC)"
export CCPLUS="$(tc-getCXX)"
default