From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1400450-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9751A158090
for <garchives@archives.gentoo.org>; Wed, 25 May 2022 08:15:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CFCE5E08FE;
Wed, 25 May 2022 08:15:27 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B55C4E08FE
for <gentoo-commits@lists.gentoo.org>; Wed, 25 May 2022 08:15:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CAA7734164C
for <gentoo-commits@lists.gentoo.org>; Wed, 25 May 2022 08:15:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2110748C
for <gentoo-commits@lists.gentoo.org>; Wed, 25 May 2022 08:15:25 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@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, "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
Message-ID: <1653427801.6f826a3a6d6b7328a362fe4830c0ddb4a0aacbe6.andrewammerlaan@gentoo>
Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: sci-mathematics/frama-c/files/frama-c-24.0-fix-bflags.patch sci-mathematics/frama-c/frama-c-24.0.ebuild
X-VCS-Directories: sci-mathematics/frama-c/files/ sci-mathematics/frama-c/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: 6f826a3a6d6b7328a362fe4830c0ddb4a0aacbe6
X-VCS-Branch: master
Date: Wed, 25 May 2022 08:15:25 +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: 6c08d4d1-6531-40d6-b9a6-104c5ac31a27
X-Archives-Hash: 89b6ee2bf71d0e8ed91e9d8dfd9c7d97
commit: 6f826a3a6d6b7328a362fe4830c0ddb4a0aacbe6
Author: François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
AuthorDate: Tue May 24 21:08:26 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue May 24 21:30:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f826a3a
sci-mathematics/frama-c: better fix for flags issue
Signed-off-by: François-Xavier Carton <fx.carton91 <AT> gmail.com>
sci-mathematics/frama-c/files/frama-c-24.0-fix-bflags.patch | 12 ++++++++++++
sci-mathematics/frama-c/frama-c-24.0.ebuild | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/frama-c/files/frama-c-24.0-fix-bflags.patch b/sci-mathematics/frama-c/files/frama-c-24.0-fix-bflags.patch
new file mode 100644
index 000000000..b52231fa0
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-24.0-fix-bflags.patch
@@ -0,0 +1,12 @@
+https://git.frama-c.com/pub/frama-c/-/issues/2593
+
+--- a/Makefile 2021-11-30 01:00:00.000000000 +0100
++++ b/Makefile 2022-01-14 15:19:18.855072759 +0100
+@@ -671,6 +671,7 @@
+
+ NON_OPAQUE_DEPS+= src/kernel_services/plugin_entry_points/dynamic
+
++src/kernel_services/abstract_interp/abstract_memory.cmi: BFLAGS := $(BFLAGS)
+ src/kernel_services/abstract_interp/abstract_memory.cmo: BFLAGS += -rectypes
+ src/kernel_services/abstract_interp/abstract_memory.cmx: OFLAGS += -rectypes
+
diff --git a/sci-mathematics/frama-c/frama-c-24.0.ebuild b/sci-mathematics/frama-c/frama-c-24.0.ebuild
index 59f668c96..6d8212f5a 100644
--- a/sci-mathematics/frama-c/frama-c-24.0.ebuild
+++ b/sci-mathematics/frama-c/frama-c-24.0.ebuild
@@ -27,13 +27,15 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-${NAME}"
+PATCHES=( ${FILESDIR}/frama-c-24.0-fix-bflags.patch )
+
src_prepare() {
mv configure.in configure.ac || die
sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die
touch config_file || die
sed -i '/^\t\$(CC)/s/ -O3 /$(CFLAGS)/' Makefile || die
eautoreconf
- eapply_user
+ default
}
src_configure() {
@@ -45,8 +47,6 @@ src_configure() {
src_compile() {
tc-export AR
- # workaround for https://git.frama-c.com/pub/frama-c/-/issues/2593
- emake VERBOSEMAKE=yes src/kernel_services/abstract_interp/abstract_memory.cmi
emake VERBOSEMAKE=yes
}