* [gentoo-commits] repo/gentoo:master commit in: sci-libs/givaro/files/, sci-libs/givaro/
@ 2021-08-07 16:37 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2021-08-07 16:37 UTC (permalink / raw
To: gentoo-commits
commit: ae6b26acdfebbf19c8f8855a63fd86bab3e63b5d
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 16:08:09 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 16:35:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b26ac
sci-libs/givaro: new revision to eliminate -fabi-version=6.
This is just a quick hack directly to the ./configure script to ensure
that the current version of givaro doesn't erroneously detect gcc-4.x
where none exists. A real fix is already upstreamed, but not in a
release, and is not easy to backport.
Bug: https://bugs.gentoo.org/741434
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch | 36 ++++++++++++++++
sci-libs/givaro/givaro-4.1.1-r2.ebuild | 56 +++++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
new file mode 100644
index 00000000000..0564c7f94fe
--- /dev/null
+++ b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
@@ -0,0 +1,36 @@
+From 5ba9fa4930b347aea8817da444bea5a88971079a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 11:43:29 -0400
+Subject: [PATCH 1/1] configure: hack out old GCC-4.x test.
+
+The Givaro ./configure script fails to detect modern versions of GCC,
+instead deciding that they must be gcc-4.8. As a result, we wind up
+with "-fabi-version=6" in CXXFLAGS, which then gets propagated to
+users of "givaro-config --cflags", like fflas-ffpack.
+
+This is already fixed upstream, but not in a release, and not in a
+way that I care to backport. Here we just hack the configure script
+directly since the change is so trivial.
+---
+ configure | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure b/configure
+index 1eb75b0..f3bbb52 100755
+--- a/configure
++++ b/configure
+@@ -17172,11 +17172,6 @@ fi
+
+ echo "-----------------------------------------------"
+
+-if test "x$CCNAM" = "xgcc48"; then :
+- REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"
+-fi
+-
+-
+
+ # Machine characteristics
+
+--
+2.31.1
+
diff --git a/sci-libs/givaro/givaro-4.1.1-r2.ebuild b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
new file mode 100644
index 00000000000..2e76210dd2e
--- /dev/null
+++ b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for arithmetic and algebraic computations"
+HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
+SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0/9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+DEPEND="dev-libs/gmp:0[cxx(+)]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/givaro-4.1.1-gcc-10.patch" )
+
+src_configure() {
+ # Passing "--disable-doc" also accidentally enables building
+ # the documentation, so we can't just $(use_enable doc) here.
+ # https://github.com/linbox-team/givaro/issues/148
+ econf \
+ $(usex doc --enable-doc "" "" "") \
+ --with-docdir="/usr/share/doc/${PF}/html" \
+ $(use_enable static-libs static) \
+ $(use_enable cpu_flags_x86_fma3 fma) \
+ $(use_enable cpu_flags_x86_fma4 fma4) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_ssse3 ssse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse41) \
+ $(use_enable cpu_flags_x86_sse4_2 sse42) \
+ $(use_enable cpu_flags_x86_avx avx) \
+ $(use_enable cpu_flags_x86_avx2 avx2)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/givaro/files/, sci-libs/givaro/
@ 2024-07-14 23:22 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2024-07-14 23:22 UTC (permalink / raw
To: gentoo-commits
commit: aeb929c40312b398965ff0c5aa28aa4819c14e72
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 23:07:36 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 23:21:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb929c4
sci-libs/givaro: drop 4.1.1-r3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/givaro/Manifest | 1 -
sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch | 36 ---------------
sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch | 23 ----------
sci-libs/givaro/givaro-4.1.1-r3.ebuild | 60 -------------------------
4 files changed, 120 deletions(-)
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 20cac6206f66..1b16b256a854 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,2 +1 @@
-DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
DIST givaro-4.2.0.tar.gz 969595 BLAKE2B 07c9f08269ee60c06b1589e56ccf61870df6c7cab93fb8ebf27791d9231b153a2da9aed296105fd6dcd52aaa7d27ea03eacd6f2066d29de267455c9ca3747995 SHA512 1a3280563181710d364b77e1efe8c8f52ce3119a08b35f329cfd98136a742431b7e9d102289448d337797f815439682d0cfce1567a5a88d5851b244673a84486
diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
deleted file mode 100644
index 0564c7f94fef..000000000000
--- a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5ba9fa4930b347aea8817da444bea5a88971079a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 7 Aug 2021 11:43:29 -0400
-Subject: [PATCH 1/1] configure: hack out old GCC-4.x test.
-
-The Givaro ./configure script fails to detect modern versions of GCC,
-instead deciding that they must be gcc-4.8. As a result, we wind up
-with "-fabi-version=6" in CXXFLAGS, which then gets propagated to
-users of "givaro-config --cflags", like fflas-ffpack.
-
-This is already fixed upstream, but not in a release, and not in a
-way that I care to backport. Here we just hack the configure script
-directly since the change is so trivial.
----
- configure | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure b/configure
-index 1eb75b0..f3bbb52 100755
---- a/configure
-+++ b/configure
-@@ -17172,11 +17172,6 @@ fi
-
- echo "-----------------------------------------------"
-
--if test "x$CCNAM" = "xgcc48"; then :
-- REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"
--fi
--
--
-
- # Machine characteristics
-
---
-2.31.1
-
diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch
deleted file mode 100644
index 15178289ca84..000000000000
--- a/sci-libs/givaro/files/givaro-4.1.1-gcc-13.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c7744bb133496cd7ac04688f345646d505e1bf52 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 19 Jan 2023 09:12:22 -0500
-Subject: [PATCH] Add missing #include <cstdint> for (u)int64_t
-
-Fixes failure to compile on GCC 13.
----
- src/library/poly1/givdegree.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/library/poly1/givdegree.h b/src/library/poly1/givdegree.h
-index 3753a425..eb85a0dd 100644
---- a/src/library/poly1/givdegree.h
-+++ b/src/library/poly1/givdegree.h
-@@ -19,6 +19,8 @@
- #ifndef __GIVARO_poly1degree_H
- #define __GIVARO_poly1degree_H
-
-+#include <cstdint>
-+
- #include <iostream>
-
- namespace Givaro {
diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild
deleted file mode 100644
index e6da3ebb6eaa..000000000000
--- a/sci-libs/givaro/givaro-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="C++ library for arithmetic and algebraic computations"
-HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
-SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="CeCILL-B"
-SLOT="0/9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? (
- app-text/doxygen[dot]
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-DEPEND="dev-libs/gmp:0[cxx(+)]"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}/givaro-4.1.1-gcc-10.patch"
- "${FILESDIR}/givaro-4.1.1-gcc-13.patch"
- "${FILESDIR}/givaro-4.1.1-fix-pc-libdir.patch"
-)
-
-src_configure() {
- # Passing "--disable-doc" also accidentally enables building
- # the documentation, so we can't just $(use_enable doc) here.
- # https://github.com/linbox-team/givaro/issues/148
- econf \
- $(usex doc --enable-doc "" "" "") \
- --with-docdir="/usr/share/doc/${PF}/html" \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_fma3 fma) \
- $(use_enable cpu_flags_x86_fma4 fma4) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable cpu_flags_x86_sse3 sse3) \
- $(use_enable cpu_flags_x86_ssse3 ssse3) \
- $(use_enable cpu_flags_x86_sse4_1 sse41) \
- $(use_enable cpu_flags_x86_sse4_2 sse42) \
- $(use_enable cpu_flags_x86_avx avx) \
- $(use_enable cpu_flags_x86_avx2 avx2)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-14 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-07 16:37 [gentoo-commits] repo/gentoo:master commit in: sci-libs/givaro/files/, sci-libs/givaro/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2024-07-14 23:22 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox