diff options
| -rw-r--r-- | sci-mathematics/gap/Manifest | 1 | ||||
| -rw-r--r-- | sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch | 42 | ||||
| -rw-r--r-- | sci-mathematics/gap/gap-4.12.2-r4.ebuild | 144 |
3 files changed, 0 insertions, 187 deletions
diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest index 17dbe0f804b4..09989d8cafce 100644 --- a/sci-mathematics/gap/Manifest +++ b/sci-mathematics/gap/Manifest @@ -1,2 +1 @@ -DIST gap-4.12.2-core.tar.gz 37671069 BLAKE2B 7e2c35f0bb232fc5478ff09e98b9c4d021ee5df775f2ff4934b27f871c18a3781386c24b94f1255517c4193c1eb9ff6396ea70e8d6cf72ccbb5480ca837ef8eb SHA512 d16af2648b0a655df7ce28cf8e2c6b3d0e33eda806674844a9813b4cb5068b137005225c02b8651a25b608e9b76a184f54f2e291a957a4675c38a7883ef83a38 DIST gap-4.13.0-core.tar.gz 38666910 BLAKE2B 42e6ccd4c7474efec6f9faab7bbc67c264df7f3a3b62945faa53150a00d6944aa8a2cc5e5c9f99440541211d5279bdaed458ce8351375f8e14f0380f612e8c89 SHA512 d7326dc49f1c646853e66a48b83c8053bb80625289fbaa54b12b8f88c016d41cbf78d67333def0c3ac36d93f602811d2cb4ee5d56c37aa7efd13ce8ce6808f3c diff --git a/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch b/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch deleted file mode 100644 index cfdfb4ac8a11..000000000000 --- a/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2933af2d8a986430a4fcf2ab4d577e5bb049662a Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 2 Feb 2024 18:14:59 -0500 -Subject: [PATCH] cnf/gac.in: respect $CC and $CXX if they're non-null - -This allows the user to override the stored C and C++ compilers -(typically obtained from sysinfo.gap) if desired. This is especially -useful on rolling release and/or source-based distributions where the -"current" compiler can change frequently and without user interaction. - -Closes: https://github.com/gap-system/gap/issues/5606 ---- - cnf/gac.in | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/cnf/gac.in b/cnf/gac.in -index 1faafba820..3a9fc6eb16 100644 ---- a/cnf/gac.in -+++ b/cnf/gac.in -@@ -63,6 +63,22 @@ GAP_CFLAGS="${GAP_CFLAGS} ${GAC_CFLAGS}" - GAP_CXXFLAGS="${GAP_CXXFLAGS} ${GAC_CFLAGS}" - GAP_LDFLAGS="${GAP_LDFLAGS} ${GAC_LDFLAGS}" - -+# Using the stored C/C++ compilers from sysinfo.gap is sometimes -+# undesirable. For example, if the compiler suite is upgraded or -+# downgraded, the particular executable used to build GAP itself may -+# no longer exist. The CC and CXX environment variables provide a -+# somewhat standard way for the user to indicate which compilers he -+# would like to use. So if those are set, we prefer them to the stored -+# values. This allows people who know what they are doing to override -+# the default behavior, while keeping the defaults safe for normal -+# people. -+if test -n "${CC}"; then -+ c_compiler="${CC}" -+ c_dyn_linker="${CC}" -+fi -+if test -n "${CXX}"; then -+ cxx_compiler="${CXX}" -+fi - - # is output going to a terminal? - if test -t 1 && command -v tput >/dev/null 2>&1 ; then diff --git a/sci-mathematics/gap/gap-4.12.2-r4.ebuild b/sci-mathematics/gap/gap-4.12.2-r4.ebuild deleted file mode 100644 index f9f41bafaaab..000000000000 --- a/sci-mathematics/gap/gap-4.12.2-r4.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="System for computational discrete algebra. Core functionality." -HOMEPAGE="https://www.gap-system.org/" -SRC_URI="https://github.com/gap-system/gap/releases/download/v${PV}/${P}-core.tar.gz" - -LICENSE="GPL-2+" -SLOT="0/8" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_popcnt debug memcheck minimal readline test valgrind" -REQUIRED_USE="?? ( memcheck valgrind )" -RESTRICT="!test? ( test )" - -# The minimum set of packages needed for basic GAP operation. You can -# actually start gap without these by passing "--bare" to it on the CLI, -# but don't expect anything to work. -REQUIRED_PKGS=" - dev-gap/gapdoc - dev-gap/primgrp - dev-gap/smallgrp - dev-gap/transgrp" - -# The packages aren't really required, but GAP tries to load them -# automatically, and will complain to the user if they fail to load. -# The list of automatically-loaded packages is a user preference, called -# AutoloadPackages, and the upstream default can be found in -# lib/package.gi within the GAP source tree. Passing "-A" to GAP on the -# CLI (or setting that user preference) will suppress the autoload -# behavior and allow GAP to start without these, which is why we allow -# the user to skip them with USE=minimal if he knows what he is doing. -AUTOLOADED_PKGS=" - dev-gap/autpgrp - dev-gap/alnuth - dev-gap/crisp - dev-gap/ctbllib - dev-gap/factint - dev-gap/fga - dev-gap/irredsol - dev-gap/laguna - dev-gap/polenta - dev-gap/polycyclic - dev-gap/resclasses - dev-gap/sophus - dev-gap/tomlib" - -# The test suite will fail without the "required" subset. -BDEPEND="test? ( ${REQUIRED_PKGS} )" - -DEPEND="dev-libs/gmp:= - sys-libs/zlib - valgrind? ( dev-debug/valgrind ) - readline? ( sys-libs/readline:= )" - -RDEPEND="${DEPEND}" - -# If you _really_ want to install GAP without the set of required -# packages, use package.provided. -PDEPEND="${REQUIRED_PKGS} !minimal? ( ${AUTOLOADED_PKGS} )" - -PATCHES=( "${FILESDIR}/${P}-cc-and-cxx-for-gac.patch" ) - -pkg_setup() { - if use valgrind; then - elog "If you enable the use of valgrind during building" - elog "be sure that you have enabled the proper flags" - elog "in gcc to support it:" - elog "https://wiki.gentoo.org/wiki/Debugging#Valgrind" - fi -} - -src_prepare() { - # Remove these to be extra sure we don't use bundled libraries. - rm -r extern || die - rm -r hpcgap/extern || die - - # The Makefile just tells you to run ./configure, which then - # produces a GNUmakefile. - rm Makefile || die - - # Prepend AC_CONFIG_MACRO_DIRS to configure.ac so that eautoreconf - # recreates aclocal.m4 correctly. Upstream bundles libtool-2.4.6, - # and Gentoo uses 2.4.7, so we need to regenerate aclocal.m4. BUT, - # upstream also uses m4_include directives in aclocal.m4 rather than - # AC_CONFIG_MACRO_DIRS in configure.ac. Without AC_CONFIG_MACRO_DIRS - # eautoreconf will omit all of the macros in cnf/m4. - sed -e '1s;^;AC_CONFIG_MACRO_DIRS([cnf/m4])\n;' -i configure.ac || die - - default - - # Fix feature detection with pathological CFLAGS - eautoreconf -} - -src_configure() { - # We unset $ABI because GAP uses it internally for something else. - # --without-gmp and --without-zlib both trigger an AC_MSG_ERROR - local myeconfargs=( - ABI="" - --with-gmp - --with-zlib - $(use_enable cpu_flags_x86_popcnt popcnt) - $(use_enable memcheck memory-checking) - $(use_enable valgrind) - $(use_with readline) - $(use_enable debug) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # Without this, the default is a quiet build. - emake V=1 -} - -src_test() { - # We need to specify additional root paths because otherwise the - # recently-built GAP doesn't know where to look for the "required" - # packages (which must already be installed). The two paths we - # append to $S are where those packages wind up. - local gaproots="${S}/;" - gaproots+="${EPREFIX}/usr/$(get_libdir)/gap/;" - gaproots+="${EPREFIX}/usr/share/gap/" - - # GAPARGS is a Makefile variable that exists for this purpose. We - # use "-A" to hide the warnings about missing autoloaded-but-not- - # required packages. - emake GAPARGS="-A -l '${gaproots}'" check -} - -src_install() { - default - - # Manually install Makefile.gappkg - insinto usr/share/gap/etc - doins etc/Makefile.gappkg - - # la files removal - find "${ED}" -type f -name '*.la' -delete || die -} |