| 1 |
commit: ae3ffad2c35d356a7f5b05daf3eb1799e1000d56 |
| 2 |
Author: Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Sep 10 20:17:37 2022 +0000 |
| 4 |
Commit: Patrick Taylor <patrick.joseph.taylor <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Sep 10 20:19:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae3ffad2 |
| 7 |
|
| 8 |
sci-chemistry/xcrysden: replace patch with flag-o-matic to set -fcommon |
| 9 |
|
| 10 |
Signed-off-by: Patrick J Taylor <patrick.joseph.taylor <AT> gmail.com> |
| 11 |
|
| 12 |
.../xcrysden/files/xcrysden-1.6.2-gcc_flags.patch | 14 -------------- |
| 13 |
sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 4 ++-- |
| 14 |
2 files changed, 2 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index ef231827e..000000000 |
| 19 |
--- a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,14 +0,0 @@ |
| 22 |
-Adds -fcommon to CFLAGS to allow compilation on more recent GCC. |
| 23 |
-diff --git a/system/Make.sys-shared b/system/Make.sys-shared |
| 24 |
-index 51891e7..f89f876 100644 |
| 25 |
---- a/system/Make.sys-shared |
| 26 |
-+++ b/system/Make.sys-shared |
| 27 |
-@@ -19,7 +19,7 @@ MAKE = make |
| 28 |
- # C-preprocessor flags |
| 29 |
- CPPFLAGS ?= |
| 30 |
- # C-compiler flags |
| 31 |
--CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall |
| 32 |
-+CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon |
| 33 |
- |
| 34 |
- CC = gcc |
| 35 |
- #LDLIB = -ldl |
| 36 |
|
| 37 |
diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
| 38 |
index c6ecb73d0..b243f1a06 100644 |
| 39 |
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
| 40 |
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild |
| 41 |
@@ -3,7 +3,7 @@ |
| 42 |
|
| 43 |
EAPI=8 |
| 44 |
|
| 45 |
-inherit desktop xdg |
| 46 |
+inherit desktop flag-o-matic xdg |
| 47 |
|
| 48 |
DESCRIPTION="For the visualisation of molecular and crystal structures." |
| 49 |
|
| 50 |
@@ -28,7 +28,6 @@ BDEPEND="${RDEPEND}" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}/${P}-ext-bwidget.patch" |
| 54 |
- "${FILESDIR}/${P}-gcc_flags.patch" |
| 55 |
"${FILESDIR}/${P}-Togl_lib.patch" |
| 56 |
"${FILESDIR}/${P}-wrapper_paths.patch" |
| 57 |
) |
| 58 |
@@ -39,6 +38,7 @@ src_prepare() { |
| 59 |
} |
| 60 |
|
| 61 |
src_compile() { |
| 62 |
+ append-cflags "-fcommon" |
| 63 |
emake xcrysden |
| 64 |
} |
Archives