From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 51760158095 for ; Sat, 10 Sep 2022 20:19:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A59EE0973; Sat, 10 Sep 2022 20:19:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 02239E0973 for ; Sat, 10 Sep 2022 20:19:25 +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 E989D340F25 for ; Sat, 10 Sep 2022 20:19:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A2F5560 for ; Sat, 10 Sep 2022 20:19:23 +0000 (UTC) From: "Patrick Taylor" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Taylor" Message-ID: <1662841144.ae3ffad2c35d356a7f5b05daf3eb1799e1000d56.patrick.joseph.taylor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild X-VCS-Directories: sci-chemistry/xcrysden/files/ sci-chemistry/xcrysden/ X-VCS-Committer: patrick.joseph.taylor X-VCS-Committer-Name: Patrick Taylor X-VCS-Revision: ae3ffad2c35d356a7f5b05daf3eb1799e1000d56 X-VCS-Branch: dev Date: Sat, 10 Sep 2022 20:19:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee5d55d2-22b2-4ce1-ad9d-732a793164c3 X-Archives-Hash: 9f1018bda7914e993f31823d0ff0cf6b commit: ae3ffad2c35d356a7f5b05daf3eb1799e1000d56 Author: Patrick J Taylor gmail com> AuthorDate: Sat Sep 10 20:17:37 2022 +0000 Commit: Patrick Taylor gmail com> CommitDate: Sat Sep 10 20:19:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae3ffad2 sci-chemistry/xcrysden: replace patch with flag-o-matic to set -fcommon Signed-off-by: Patrick J Taylor gmail.com> .../xcrysden/files/xcrysden-1.6.2-gcc_flags.patch | 14 -------------- sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch deleted file mode 100644 index ef231827e..000000000 --- a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -Adds -fcommon to CFLAGS to allow compilation on more recent GCC. -diff --git a/system/Make.sys-shared b/system/Make.sys-shared -index 51891e7..f89f876 100644 ---- a/system/Make.sys-shared -+++ b/system/Make.sys-shared -@@ -19,7 +19,7 @@ MAKE = make - # C-preprocessor flags - CPPFLAGS ?= - # C-compiler flags --CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -+CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon - - CC = gcc - #LDLIB = -ldl diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild index c6ecb73d0..b243f1a06 100644 --- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild +++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit desktop xdg +inherit desktop flag-o-matic xdg DESCRIPTION="For the visualisation of molecular and crystal structures." @@ -28,7 +28,6 @@ BDEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${P}-ext-bwidget.patch" - "${FILESDIR}/${P}-gcc_flags.patch" "${FILESDIR}/${P}-Togl_lib.patch" "${FILESDIR}/${P}-wrapper_paths.patch" ) @@ -39,6 +38,7 @@ src_prepare() { } src_compile() { + append-cflags "-fcommon" emake xcrysden }