aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Taylor <patrick.joseph.taylor@gmail.com>2022-09-10 21:17:37 +0100
committerPatrick J Taylor <patrick.joseph.taylor@gmail.com>2022-09-10 21:19:04 +0100
commitae3ffad2c35d356a7f5b05daf3eb1799e1000d56 (patch)
tree0f76c5797598689f4798f1ad9c2eaf541f85f4e7 /sci-chemistry
parentmpv-plugin/mpv-mpris: drop 0.7.1-r1, 0.8 (diff)
downloadguru-ae3ffad2c35d356a7f5b05daf3eb1799e1000d56.tar.gz
guru-ae3ffad2c35d356a7f5b05daf3eb1799e1000d56.tar.bz2
guru-ae3ffad2c35d356a7f5b05daf3eb1799e1000d56.zip
sci-chemistry/xcrysden: replace patch with flag-o-matic to set -fcommon
Signed-off-by: Patrick J Taylor <patrick.joseph.taylor@gmail.com>
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch14
-rw-r--r--sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild4
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 ef231827e2..0000000000
--- 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 c6ecb73d0d..b243f1a060 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
}