[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/files/, dev-libs/isl/
commit: d19a7f9d9ba8362f9e12a28805957bf17c0b6cb2
Author: Sam James gentoo org>
AuthorDate: Sun Oct 10 22:57:25 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 10 22:57:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19a7f9d
dev-libs/isl: respect CFLAGS
Drop the fun (and aggressive) AX_CC_MAXOPT macro call
which was causing us to not respect the user's CFLAGS.
Note that 0.24 seemed to be triggering maintainer mode;
have chucked eautoreconf into the ebuild for 0.24-r1
given it seemingly wasn't doing any harm to be doing
it informally in 0.24 anyway, but will keep an eye on
it.
Revbump because of the aforementioned churn in a
critical dependency.
Bug: https://bugs.gentoo.org/815700
Signed-off-by: Sam James gentoo.org>
dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch | 35 ++
dev-libs/isl/files/isl-0.24-respect-flags.patch| 14 +
.../isl/{isl-0.24.ebuild => isl-0.24-r1.ebuild}| 19
dev-libs/isl/isl-0.24.ebuild | 6 ++--
4 files changed, 67 insertions(+), 7 deletions(-)
diff --git a/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
new file mode 100644
index 000..6751d5755fb
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
@@ -0,0 +1,35 @@
+diff -Naur isl-0.19.orig/Makefile.in isl-0.19/Makefile.in
+--- isl-0.19.orig/Makefile.in 2018-03-03 11:32:15.0 -0500
isl-0.19/Makefile.in 2018-03-10 17:29:30.039182728 -0500
+@@ -2269,10 +2269,10 @@
+ case $$libisl in \
+ '') echo Cannot find isl library name. GDB bindings not installed.;; \
+ *) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++
$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++ test -z "$(libdir)" || $(MKDIR_P)
"$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++ $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ esac
+
+ uninstall-local:
+diff --git a/Makefile.am b/Makefile.am
+index 96cac65..8bb6aa2 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -639,10 +639,10 @@ install-data-local: $(srcdir)/libisl-gdb.py
+ case $$libisl in \
+ '') echo Cannot find isl library name. GDB bindings not installed.;; \
+ *) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++
$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++ test -z "$(libdir)" || $(MKDIR_P)
"$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++
$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ esac
+
+ uninstall-local:
diff --git a/dev-libs/isl/files/isl-0.24-respect-flags.patch
b/dev-libs/isl/files/isl-0.24-respect-flags.patch
new file mode 100644
index 000..e00748b2433
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-respect-flags.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/815700
+
+--- a/configure.ac
b/configure.ac
+@@ -22,7 +22,6 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AX_PROG_CC_FOR_BUILD
+
+-AX_CC_MAXOPT
+ AX_GCC_WARN_UNUSED_RESULT
+ AX_C___ATTRIBUTE__
+
+--
+
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24-r1.ebuild
similarity index 79%
copy from dev-libs/isl/isl-0.24.ebuild
copy to dev-libs/isl/isl-0.24-r1.ebuild
index 9b5ae94248d..17e0ea9fca5 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=7
-inherit multilib-minimal preserve-libs toolchain-funcs
+inherit autotools multilib-minimal preserve-libs toolchain-funcs
DESCRIPTION="A library for manipulating integer points bounded by linear
constraints"
HOMEPAGE="http://isl.gforge.inria.fr/;
@@ -11,7 +11,7 @@ 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"
+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}]"
@@ -23,10 +23,17 @@ BDEPEND="
DOCS=( ChangeLog AUTHORS doc/manual.pdf )
PATCHES=(
- "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/files/, dev-libs/isl/
commit: 611d3746e7445cf612bb4a623ebdff15879afc9d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun May 2 21:31:09 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun May 2 21:31:19 2021 +
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 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 000..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.0 +
b/configure.ac 2021-04-28 19:34:28.615119537 +
+@@ -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/configure2020-11-01 13:53:55.0 +
b/configure2021-04-28 19:34:29.246125644 +
+@@ -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 000..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) \
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/files/, dev-libs/isl/
commit: 2d461c6e412b92e54452b544703236c4b30b6007
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Nov 10 22:16:11 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 10 22:20:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d461c6e
dev-libs/isl: restore 0.12.2
Used by cloog-0.18.1.
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-libs/isl/Manifest | 1 +
dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch | 17 ++
dev-libs/isl/isl-0.12.2.ebuild | 38 ++
3 files changed, 56 insertions(+)
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index efb9291cd21..0c709494b78 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,2 +1,3 @@
+DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B
53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219
SHA512
b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
DIST isl-0.21.tar.xz 1621680 BLAKE2B
ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5
SHA512
87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
DIST isl-0.22.tar.xz 1676992 BLAKE2B
1cb2125761adec02d9f337e8730faa5bc3a4e63cb7d968f7f4de3a3360b1f9be6caf6a27031f02df1ebe149fb70b6a32bdddbe8ae03032b8ff366f4eac274483
SHA512
7c3c9502ea07e4d47a823841837c3aa0b9d7ba0fe58deaf180734e44c18e53735ec783645da0bdc56b617c9e639b226cc03b40a947f852e1e787166a64f59424
diff --git a/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
b/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
new file mode 100644
index 000..58e80b29687
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.07-gdb-autoload-dir.patch
@@ -0,0 +1,17 @@
+Install python module into gdb auto-load directory.
+
+--- a/Makefile.in
b/Makefile.in
+@@ -2189,9 +2189,9 @@ install-data-local: $(srcdir)/isl.py
+ case $$libisl in \
+ '') echo Cannot find isl library name. GDB bindings not installed.;; \
+ *) echo $(INSTALL_DATA) $(srcdir)/isl.py \
+- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
+- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py;
esac
++
$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++ test -z "$(libdir)" || $(MKDIR_P)
"$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
++ $(INSTALL_DATA) $(srcdir)/isl.py
$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
new file mode 100644
index 000..17e0f4be337
--- /dev/null
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+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.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0/10"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
+
+ # m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
+ # https://groups.google.com/group/isl-development/t/37ad876557e50f2c
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
