commit: 611d3746e7445cf612bb4a623ebdff15879afc9d Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun May 2 21:31:09 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun May 2 21:31:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611d3746
dev-libs/isl: bump up to 0.24 While at it applied bashism fix by Matt Whitlock. Fix-by: Matt Whitlock Closes: https://bugs.gentoo.org/786564 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-libs/isl/Manifest | 1 + dev-libs/isl/files/isl-0.24-nobash.patch | 35 ++++++++++++++++ dev-libs/isl/isl-0.24.ebuild | 71 ++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest index 55a0904ac89..326d1e9eaea 100644 --- a/dev-libs/isl/Manifest +++ b/dev-libs/isl/Manifest @@ -1 +1,2 @@ DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20 +DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8 diff --git a/dev-libs/isl/files/isl-0.24-nobash.patch b/dev-libs/isl/files/isl-0.24-nobash.patch new file mode 100644 index 00000000000..226daa551c7 --- /dev/null +++ b/dev-libs/isl/files/isl-0.24-nobash.patch @@ -0,0 +1,35 @@ +Fix-by: Matt Whitlock +Bug: https://bugs.gentoo.org/786564 +--- a/configure.ac 2020-11-01 13:53:47.000000000 +0000 ++++ b/configure.ac 2021-04-28 19:34:28.615119537 +0000 +@@ -83,8 +83,8 @@ + AM_CONDITIONAL(GMP_FOR_MP, test x$with_int = xgmp) + + AM_CONDITIONAL(HAVE_CXX11, test "x$HAVE_CXX11" = "x1") +-AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" == "ximath-32") +-AS_IF([test "x$with_int" == "ximath-32"], [ ++AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" = "ximath-32") ++AS_IF([test "x$with_int" = "ximath-32"], [ + AC_DEFINE([USE_SMALL_INT_OPT], [], [Use small integer optimization]) + ]) + +--- a/configure 2020-11-01 13:53:55.000000000 +0000 ++++ b/configure 2021-04-28 19:34:29.246125644 +0000 +@@ -20654,7 +20654,7 @@ + HAVE_CXX11_FALSE= + fi + +- if test "x$with_int" == "ximath-32"; then ++ if test "x$with_int" = "ximath-32"; then + SMALL_INT_OPT_TRUE= + SMALL_INT_OPT_FALSE='#' + else +@@ -20662,7 +20662,7 @@ + SMALL_INT_OPT_FALSE= + fi + +-if test "x$with_int" == "ximath-32"; then : ++if test "x$with_int" = "ximath-32"; then : + + + $as_echo "#define USE_SMALL_INT_OPT /**/" >>confdefs.h diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild new file mode 100644 index 00000000000..5793b07aae3 --- /dev/null +++ b/dev-libs/isl/isl-0.24.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib-minimal preserve-libs toolchain-funcs + +DESCRIPTION="A library for manipulating integer points bounded by linear constraints" +HOMEPAGE="http://isl.gforge.inria.fr/"; +SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"; + +LICENSE="LGPL-2.1" +SLOT="0/23" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig" + +DOCS=( ChangeLog AUTHORS doc/manual.pdf ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch + "${FILESDIR}"/${PN}-0.24-nobash.patch +) + +multilib_src_configure() { + local econf_opts=( + $(use_enable static-libs static) + + # AX_PROG_CC_FOR_BUILD deficiency: + # https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks + CC_FOR_BUILD="$(tc-getBUILD_CC)" + ) + if ! tc-is-cross-compiler; then + # Incorrect CFLAGS handling as CFLAGS_FOR_BUILD + # even for native builds. As a result -O3 is being used + # regardless of user's CFLAGS. + econf_opts+=( + CFLAGS_FOR_BUILD="${CFLAGS}" + ) + fi + + ECONF_SOURCE="${S}" econf "${econf_opts[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete +} + +pkg_preinst() { + preserve_old_lib \ + /usr/$(get_libdir)/libisl$(get_libname 14) \ + /usr/$(get_libdir)/libisl$(get_libname 15) \ + /usr/$(get_libdir)/libisl$(get_libname 19) \ + /usr/$(get_libdir)/libisl$(get_libname 21) \ + /usr/$(get_libdir)/libisl$(get_libname 22) +} + +pkg_postinst() { + preserve_old_lib_notify \ + /usr/$(get_libdir)/libisl$(get_libname 14) \ + /usr/$(get_libdir)/libisl$(get_libname 15) \ + /usr/$(get_libdir)/libisl$(get_libname 19) \ + /usr/$(get_libdir)/libisl$(get_libname 21) \ + /usr/$(get_libdir)/libisl$(get_libname 22) +}
