[gentoo-commits] repo/proj/guru:dev commit in: sys-devel/gsl/files/, sys-devel/gsl/

[gentoo-commits] repo/proj/guru:dev commit in: sys-devel/gsl/files/, sys-devel/gsl/

[Alessandro Barbieri]

commit:     1480b29b69d6d7a8981f94fbca337ae5a2db4cb7
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue May 31 15:19:46 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue May 31 15:36:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1480b29b

sys-devel/gsl: respect CC and flags

Closes: https://bugs.gentoo.org/847328
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch | 13 +++++++++++++
 sys-devel/gsl/gsl-4.1.5-r1.ebuild                 | 11 +++++++++++
 2 files changed, 24 insertions(+)

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
new file mode 100644
index 000000000..9d8ebb5f0
--- /dev/null
+++ b/sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch
@@ -0,0 +1,13 @@
+--- a/src/c
++++ b/src/c
+@@ -156,8 +156,8 @@
+ #
+ case "$($CCNAME --version)" in
+ *gcc*|*GCC*)
+-    [ -z "$BOOM_MODEL_NOOPT" ] && CCDEBUG="-O2"
+-    [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="$CCNODEBUG -O2"
++    [ -z "$BOOM_MODEL_NOOPT" ] && CCDEBUG="${CFLAGS}"
++    [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="$CCNODEBUG ${CFLAGS}"
+     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

diff --git a/sys-devel/gsl/gsl-4.1.5-r1.ebuild b/sys-devel/gsl/gsl-4.1.5-r1.ebuild
index 89ffc2238..c42875214 100644
--- a/sys-devel/gsl/gsl-4.1.5-r1.ebuild
+++ b/sys-devel/gsl/gsl-4.1.5-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 DESCRIPTION='iMatix GSL code generator'
 HOMEPAGE="https://github.com/zeromq/gsl"
 SRC_URI="https://github.com/zeromq/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -15,6 +17,15 @@ IUSE="examples"
 DEPEND="dev-libs/libpcre:3"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
+
+src_prepare() {
+	tc-export RANLIB
+	export CCNAME="$(tc-getCC)"
+	export CCPLUS="$(tc-getCXX)"
+	default
+}
+
 src_install() {
 	DESTDIR="${D}/usr" emake install
 	if use examples; then

[gentoo-commits] repo/proj/guru:dev commit in: sys-devel/gsl/files/, sys-devel/gsl/

[Alessandro Barbieri]

commit:     eaaf15c342f2cd8e5a9eba89b63c300953449f6c
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 14:17:20 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Jun  2 14:17:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eaaf15c3

sys-devel/gsl: also respect AR

Closes: https://bugs.gentoo.org/849245
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-devel/gsl/files/gsl-4.1.5-respect-flags.patch | 12 ++++++++++++
 sys-devel/gsl/gsl-4.1.5-r1.ebuild                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

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