From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1329104-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B30B3158086
for <garchives@archives.gentoo.org>; Sun, 10 Oct 2021 23:03:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D3F30E0841;
Sun, 10 Oct 2021 23:03:01 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AF29BE0841
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Oct 2021 23:03:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A8477342FEF
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Oct 2021 23:03:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7708F
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Oct 2021 23:02:58 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1633906645.d19a7f9d9ba8362f9e12a28805957bf17c0b6cb2.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/files/, dev-libs/isl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch dev-libs/isl/files/isl-0.24-respect-flags.patch dev-libs/isl/isl-0.24-r1.ebuild dev-libs/isl/isl-0.24.ebuild
X-VCS-Directories: dev-libs/isl/ dev-libs/isl/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d19a7f9d9ba8362f9e12a28805957bf17c0b6cb2
X-VCS-Branch: master
Date: Sun, 10 Oct 2021 23:02:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bbb58184-1450-489a-9e68-625ed01e5c2f
X-Archives-Hash: 62b97392cdbf7c5d2b79a7111f37ae58
commit: d19a7f9d9ba8362f9e12a28805957bf17c0b6cb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 10 22:57:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 22:57:25 2021 +0000
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 <sam <AT> 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 00000000000..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.000000000 -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 00000000000..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
+ "${FILESDIR}"/${PN}-0.24-gdb-autoload-dir.patch
"${FILESDIR}"/${PN}-0.24-nobash.patch
+ "${FILESDIR}"/${PN}-0.24-respect-flags.patch
)
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
multilib_src_configure() {
local econf_opts=(
$(use_enable static-libs static)
@@ -35,6 +42,7 @@ multilib_src_configure() {
# 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
@@ -49,7 +57,8 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- find "${ED}" -type f -name '*.la' -delete
+
+ find "${ED}" -type f -name '*.la' -delete || die
}
pkg_preinst() {
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 9b5ae94248d..ad2782f9d7c 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -1,7 +1,7 @@
# 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
@@ -35,6 +35,7 @@ multilib_src_configure() {
# 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
@@ -49,7 +50,8 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- find "${ED}" -type f -name '*.la' -delete
+
+ find "${ED}" -type f -name '*.la' -delete || die
}
pkg_preinst() {