* [gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/
@ 2022-09-10 20:19 Patrick Taylor
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Taylor @ 2022-09-10 20:19 UTC (permalink / raw
To: gentoo-commits
commit: c6a2a87c15be29578d3ce20dc49f0e324b797782
Author: Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 20:18:37 2022 +0000
Commit: Patrick Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
CommitDate: Sat Sep 10 20:19:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c6a2a87c
sci-chemistry/xcrysden: rename patches to match established convention
Signed-off-by: Patrick J Taylor <patrick.joseph.taylor <AT> gmail.com>
.../{xcrysden-1.6.2-Togl_lib.patch => xcrysden-1.6.2-Togl-lib.patch} | 0
...n-1.6.2-wrapper_paths.patch => xcrysden-1.6.2-wrapper-paths.patch} | 0
sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl_lib.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-Togl-lib.patch
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch
similarity index 100%
rename from sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper_paths.patch
rename to sci-chemistry/xcrysden/files/xcrysden-1.6.2-wrapper-paths.patch
diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index b243f1a06..99ad16333 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -28,8 +28,8 @@ BDEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-ext-bwidget.patch"
- "${FILESDIR}/${P}-Togl_lib.patch"
- "${FILESDIR}/${P}-wrapper_paths.patch"
+ "${FILESDIR}/${P}-Togl-lib.patch"
+ "${FILESDIR}/${P}-wrapper-paths.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/
@ 2022-09-10 20:19 Patrick Taylor
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Taylor @ 2022-09-10 20:19 UTC (permalink / raw
To: gentoo-commits
commit: ae3ffad2c35d356a7f5b05daf3eb1799e1000d56
Author: Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 20:17:37 2022 +0000
Commit: Patrick Taylor <patrick.joseph.taylor <AT> gmail <DOT> 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 <patrick.joseph.taylor <AT> 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/
@ 2022-09-13 18:27 Patrick Taylor
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Taylor @ 2022-09-13 18:27 UTC (permalink / raw
To: gentoo-commits
commit: f97bb147c9e7d1ae7a0cafae40ab2d891b970dc8
Author: Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
AuthorDate: Tue Sep 13 18:25:51 2022 +0000
Commit: Patrick Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
CommitDate: Tue Sep 13 18:27:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f97bb147
sci-chemistry/xcrysden: edit Makefiles to respect LDFLAGS
Closes: https://bugs.gentoo.org/869947
Signed-off-by: Patrick J Taylor <patrick.joseph.taylor <AT> gmail.com>
.../xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch | 171 +++++++++++++++++++++
sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild | 1 +
2 files changed, 172 insertions(+)
diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch
new file mode 100644
index 000000000..1ae39ae5e
--- /dev/null
+++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-LDFLAGS.patch
@@ -0,0 +1,171 @@
+diff --git a/C/Makefile b/C/Makefile
+index 2aa0307..452e0f1 100644
+--- a/C/Makefile
++++ b/C/Makefile
+@@ -12,7 +12,7 @@ include make-objects
+
+ .SUFFIXES: .o .c
+ .c.o:
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++ $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+
+ objects = $(XC_OBJS) $(EXTERNAL_OBJS)
+
+@@ -24,18 +24,18 @@ compile:
+ #objects: $(objects)
+ #
+ #$(objects): %.o: %.c
+-# $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
++# $(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $<
+
+ xcrys: $(XC_OBJS) $(EXTERNAL_OBJS)
+- $(CC) $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
++ $(CC) $(LDFLAGS) $(CFLAGS) $(XC_OBJS) $(EXTERNAL_OBJS) \
+ -o xcrys $(FFTW3_LIB) $(MESCHACH_LIB) $(TK_LIB) $(TCL_LIB) $(TOGL_LIB) $(GLU_LIB) $(GL_LIB) $(X_LIB) $(MATH) $(LDLIB) $(EXT_LIB)
+
+ xctclsh: xcTclsh.o
+- $(CC) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
++ $(CC) $(LDFLAGS) $(CFLAGS) xcTclsh.o -o xctclsh $(TCL_LIB) $(MATH) $(LDLIB)
+
+ XFS_OBJS = xsf2xsf.o
+ xsf2xsf: $(XFS_OBJS)
+- $(CC) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
++ $(CC) $(LDFLAGS) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
+
+
+ install:
+diff --git a/F/Makefile b/F/Makefile
+index 3f8270e..92f17d1 100644
+--- a/F/Makefile
++++ b/F/Makefile
+@@ -4,10 +4,10 @@ include ../Make.sys
+ .SUFFIXES : .o .f .f90
+
+ .f90.o:
+- $(FC) $(FFLAGS) -c $<
++ $(FC) $(LDFLAGS) $(FFLAGS) -c $<
+
+ .f.o:
+- $(FC) $(FFLAGS) -c $<
++ $(FC) $(LDFLAGS) $(FFLAGS) -c $<
+
+ OBJ = gengeom.o \
+ multhexa.o \
+@@ -73,70 +73,70 @@ spaghetti:
+ cd SRC_spaghetti; $(MAKE)
+
+ gengeom: $(OBJ)
+- $(FC) $(FFLAGS) -o gengeom $(OBJ)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o gengeom $(OBJ)
+
+ calplane: $(OBJ2)
+- $(FC) $(FFLAGS) -o calplane $(OBJ2)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o calplane $(OBJ2)
+
+ atomlab: $(OBJ3)
+- $(FC) $(FFLAGS) -o atomlab $(OBJ3)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o atomlab $(OBJ3)
+
+ recvec: recvec.o auxil.o
+- $(FC) $(FFLAGS) -o recvec recvec.o auxil.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o recvec recvec.o auxil.o
+
+ str2xcr: $(OBJ5)
+- $(FC) $(FFLAGS) -o str2xcr $(OBJ5)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o str2xcr $(OBJ5)
+
+ fracCoor: fracCoor.o auxil.o readf1.o
+- $(FC) $(FFLAGS) -o fracCoor fracCoor.o auxil.o readf1.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fracCoor fracCoor.o auxil.o readf1.o
+
+ multislab: $(OBJ6)
+- $(FC) $(FFLAGS) -o multislab $(OBJ6)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o multislab $(OBJ6)
+
+ savestruct: $(OBJ7)
+- $(FC) $(FFLAGS) -o savestruct $(OBJ7)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o savestruct $(OBJ7)
+
+ ftnunit: ftnunit.o
+- $(FC) $(FFLAGS) -o ftnunit ftnunit.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o ftnunit ftnunit.o
+
+ kPath: $(OBJ8)
+- $(FC) $(FFLAGS) -o kPath $(OBJ8)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o kPath $(OBJ8)
+
+ pwKPath: $(OBJ88)
+- $(FC) $(FFLAGS) -o pwKPath $(OBJ88)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwKPath $(OBJ88)
+
+ fhi_inpini2ftn34: fhi_inpini2ftn34.o
+- $(FC) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_inpini2ftn34 fhi_inpini2ftn34.o
+
+ fhi_coord2xcr: fhi_coord2xcr.o
+- $(FC) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fhi_coord2xcr fhi_coord2xcr.o
+
+ wn_readbands: $(OBJ9)
+- $(FC) $(FFLAGS) -o wn_readbands $(OBJ9) $(OBJ10)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbands $(OBJ9) $(OBJ10)
+
+ wn_readbakgen: wn_readbakgen.o
+- $(FC) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o wn_readbakgen wn_readbakgen.o
+
+ pw: pwi2xsf pwi2xsf_old pwo_xsf2xsf
+
+
+ pwi2xsf_old: $(OBJ11)
+- $(FC) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf_old $(OBJ11)
+
+ pwi2xsf: $(OBJ111)
+- $(FC) $(FFLAGS) -o pwi2xsf $(OBJ111)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwi2xsf $(OBJ111)
+
+ pwo_xsf2xsf: $(OBJ13)
+- $(FC) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o pwo_xsf2xsf $(OBJ13)
+
+ fsReadBXSF: $(OBJ12)
+- $(FC) $(FFLAGS) -o fsReadBXSF $(OBJ12)
++ $(FC) $(LDFLAGS) $(FFLAGS) -o fsReadBXSF $(OBJ12)
+
+ cube2xsf: cube2xsf.o
+- $(FC) $(FFLAGS) -o cube2xsf cube2xsf.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o cube2xsf cube2xsf.o
+
+ xsf2cube: xsf2cube.o
+- $(FC) $(FFLAGS) -o xsf2cube xsf2cube.o
++ $(FC) $(LDFLAGS) $(FFLAGS) -o xsf2cube xsf2cube.o
+
+ PROGRAMS = \
+ gengeom calplane atomlab recvec str2xcr fracCoor \
+diff --git a/F/SRC_nn/Makefile b/F/SRC_nn/Makefile
+index 2e44de1..06ae768 100644
+--- a/F/SRC_nn/Makefile
++++ b/F/SRC_nn/Makefile
+@@ -7,7 +7,7 @@ OBJ = nn.o \
+ all: nn install
+
+ nn: $(OBJ)
+- $(FC) $(FFLAGS) $(OBJ) -o nn
++ $(FC) $(LDFLAGS) $(FFLAGS) $(OBJ) -o nn
+
+ install:
+ if test -f nn.exe ; then cp nn.exe ../../bin ; \
+diff --git a/Makefile b/Makefile
+index cfdc14a..f40c8c1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,8 @@
+ #
+ #------------------------------------------------------------------------
+
++export LDFLAGS
++
+ SHELL = /bin/sh
+ TOPDIR = $(CURDIR)
+ TCL_INDEX = $(TOPDIR)/util/tcl_index
diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index b76f8a0a1..8d43bcf43 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-ext-bwidget.patch"
+ "${FILESDIR}/${P}-LDFLAGS.patch"
"${FILESDIR}/${P}-Togl-lib.patch"
"${FILESDIR}/${P}-wrapper-paths.patch"
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-13 18:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-10 20:19 [gentoo-commits] repo/proj/guru:dev commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/ Patrick Taylor
-- strict thread matches above, loose matches on Subject: below --
2022-09-13 18:27 Patrick Taylor
2022-09-10 20:19 Patrick Taylor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox