From: Phicem <Phicem@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] CalculiX-2.20
Date: Wed, 26 Oct 2022 10:03:31 +0200 [thread overview]
Message-ID: <20221026080331.FUTWSTm9C4EX5tJeXcObVHCi5DXmpF9491L4mafkcug@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39984@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]
There is an updated pull request by Phicem against master on the void-packages repository
https://github.com/Phicem/void-packages CalculiX-2.20
https://github.com/void-linux/void-packages/pull/39984
[WIP] CalculiX-2.20
### NEW PACKAGE - CalculiX
This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
CalculiX is a 3D finite element program. It is an optional but important dependency of FreeCAD (for mechanical and thermal calculations). This PR is related to issue https://github.com/void-linux/void-packages/issues/5603.
CalculiX is split in two parts: the solver (CalculiX-ccx) and the graphical interface and pre/post-processing (CalculiX-cgx).
This PR includes 5 packages, each in a separate commit:
- SPOOLES (build dependency for CalculiX-ccx)
- CalculiX-ccx
- tetgen (runtime dependency for CalculiX-cgx)
- CalculiX-cgx
- CalculiX meta-package (which brings CalculiX-ccx and CalculiX-cgx)
### Tests
#### Local build testing
- Native x86_64 (glibc): **OK**
- Native armv7l (glibc): **OK**
- Native *-musl: **NOT TESTED**
#### Cross build testing (from x86_64 machine)
- Compiling to i686: **OK**
- Compiling to x86_64-musl: **OK**
- Cross-compiling to armv7l / armv6l: **FAILED** (building works when compiling natively so is it a big issue?)
#### Runtime testing
- On x86_64: **OK** (for CalculiX-ccx: some calculation tests differ from the official reference results files)
- On armv7l: **OK** (for CalculiX-ccx: only basic tests have been run)
- On i686: **NOT TESTED**
A patch file from https://github.com/void-linux/void-packages/pull/39984.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CalculiX-2.20-39984.patch --]
[-- Type: text/x-diff, Size: 26696 bytes --]
From eeca225752381043c596d91cdbc9aa13f150583b Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 16 Oct 2022 13:55:37 +0200
Subject: [PATCH 01/22] New package: SPOOLES-2.2
---
srcpkgs/SPOOLES/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/SPOOLES/template
diff --git a/srcpkgs/SPOOLES/template b/srcpkgs/SPOOLES/template
new file mode 100644
index 000000000000..a533d24a89a8
--- /dev/null
+++ b/srcpkgs/SPOOLES/template
@@ -0,0 +1,25 @@
+# Template file for 'SPOOLES'
+pkgname=SPOOLES
+version=2.2
+revision=1
+create_wrksrc=yes
+build_style="gnu-makefile"
+make_build_target="lib"
+hostmakedepends="perl"
+short_desc="SParse Object Oriented Linear Equations Solver"
+maintainer="Phicem <phicem@gmx.com>"
+license="Public Domain"
+homepage="https://netlib.org/linalg/spooles/spooles.2.2.html"
+distfiles="https://netlib.org/linalg/spooles/spooles.${version}.tgz"
+checksum=a84559a0e987a1e423055ef4fdf3035d55b65bbe4bf915efaa1a35bef7f8c5dd
+
+do_install() {
+ vinstall spooles.a 755 usr/lib
+ HEADERS_DIR=usr/include/SPOOLES-2.2
+ for file in $(find -name '*.h') ; do
+ dir=$(dirname ${file})
+ vmkdir ${HEADERS_DIR}/${dir}
+ vinstall ${file} 644 ${HEADERS_DIR}/${dir}
+ done
+
+}
From b8056551ead6bd5c181a014b91ef745a1adb678a Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 16 Oct 2022 13:56:21 +0200
Subject: [PATCH 02/22] New package: CalculiX-ccx-2.20
---
srcpkgs/CalculiX-ccx/template | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 srcpkgs/CalculiX-ccx/template
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
new file mode 100644
index 000000000000..b8728aacc1ff
--- /dev/null
+++ b/srcpkgs/CalculiX-ccx/template
@@ -0,0 +1,35 @@
+# Template file for 'CalculiX-ccx'
+pkgname=CalculiX-ccx
+version=2.20
+revision=1
+wrksrc=CalculiX
+_ccx_dir=ccx_${version}
+_LIBS=" ${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpack.so ${XBPS_CROSS_BASE}/lib/libopenblas.so -lpthread -lm -lc"
+hostmakedepends="perl gcc-fortran"
+makedepends="SPOOLES arpack-ng-devel libgomp-devel openblas-devel"
+_FFLAGS=" -Wall -O2 -fallow-argument-mismatch"
+
+if [ "$XBPS_MACHINE" == "x86_64" ] && [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
+ makedepends+=" libquadmath"
+ hostmakedepends+=" libgomp-devel-32bit"
+fi
+short_desc="3D Structural Finite Element Program - Solver part"
+maintainer="Phicem <phicem@gmx.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.dhondt.de/"
+distfiles="http://www.dhondt.de/ccx_${version}.src.tar.bz2"
+checksum=63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf
+CFLAGS=" -Wall -O2 -I ${XBPS_CROSS_BASE}/usr/include/SPOOLES-2.2 -DARCH='Linux' -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT"
+CFLAGS+=" ${XBPS_CROSS_CFLAGS}"
+_FFLAGS+=" ${XBPS_CROSS_CFLAGS}"
+
+do_build() {
+ if [ "$CROSS_BUILD" ]; then
+ _xbps_cross_prefix="${XBPS_CROSS_TRIPLET}-"
+ fi
+ make -C ${_ccx_dir}/src CC="${_xbps_cross_prefix}gcc" FC="${_xbps_cross_prefix}gfortran" LIBS="$_LIBS" FFLAGS="$_FFLAGS" CFLAGS="$CFLAGS"
+}
+
+do_install() {
+ vbin ${_ccx_dir}/src/ccx_${version} ccx
+}
From 0bba3acc3b82eb93124065e4b53ac77a74a85803 Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 16 Oct 2022 13:56:28 +0200
Subject: [PATCH 03/22] New package: tetgen-1.5.1
---
srcpkgs/tetgen/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/tetgen/template
diff --git a/srcpkgs/tetgen/template b/srcpkgs/tetgen/template
new file mode 100644
index 000000000000..c7e68d4cd672
--- /dev/null
+++ b/srcpkgs/tetgen/template
@@ -0,0 +1,26 @@
+# Template file for 'tetgen'
+pkgname=tetgen
+version=1.5.1
+revision=1
+build_style="gnu-makefile"
+make_cmd="make -C ${pkgname}${version} -f makefile"
+hostmakedepends="tar"
+short_desc="Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"
+maintainer="Phicem <phicem@gmx.com>"
+license="AGPL-3.0-or-later"
+homepage="https://www.wias-berlin.de/software/index.jsp?id=TetGen"
+distfiles="http://www.dhondt.de/cgx_2.20.all.tar.bz2"
+checksum=f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
+make_check="no" # No tests provided
+
+do_extract() {
+ local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
+ tar -xvjf $srcdir/"$(basename ${distfiles})"
+ pwd
+ tar -xvf ${pkgname}${version}.tar
+}
+
+do_install() {
+ vbin ${pkgname}${version}/tetgen
+ vlicense ${pkgname}${version}/LICENSE
+}
From e8fc686e26f2b8ecf33b896b50648136505c4e3d Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 16 Oct 2022 13:56:43 +0200
Subject: [PATCH 04/22] New package: CalculiX-cgx-2.20
---
srcpkgs/CalculiX-cgx/files/README_LICENSES | 5 ++++
srcpkgs/CalculiX-cgx/patches/Makefile.patch | 16 ++++++++++++
srcpkgs/CalculiX-cgx/template | 27 +++++++++++++++++++++
3 files changed, 48 insertions(+)
create mode 100644 srcpkgs/CalculiX-cgx/files/README_LICENSES
create mode 100644 srcpkgs/CalculiX-cgx/patches/Makefile.patch
create mode 100644 srcpkgs/CalculiX-cgx/template
diff --git a/srcpkgs/CalculiX-cgx/files/README_LICENSES b/srcpkgs/CalculiX-cgx/files/README_LICENSES
new file mode 100644
index 000000000000..7b4d6ea22898
--- /dev/null
+++ b/srcpkgs/CalculiX-cgx/files/README_LICENSES
@@ -0,0 +1,5 @@
+cgx program is released under GNU GPL v2 or later (except for a few functions, see CGX_LICENSE)
+
+To be compiled, this program makes use of other programs released under different licenses:
+* glut is released under a custom license (see GLUT_LICENSE)
+* libSN is released under GNU GPL v2 or later
diff --git a/srcpkgs/CalculiX-cgx/patches/Makefile.patch b/srcpkgs/CalculiX-cgx/patches/Makefile.patch
new file mode 100644
index 000000000000..2b9bd1b60462
--- /dev/null
+++ b/srcpkgs/CalculiX-cgx/patches/Makefile.patch
@@ -0,0 +1,16 @@
+--- CalculiX/cgx_2.20/src/Makefile.orig 2022-07-29 11:41:00.438531485 +0200
++++ CalculiX/cgx_2.20/src/Makefile 2022-10-15 13:34:33.978116884 +0200
+@@ -1,3 +1,4 @@
++CXX=g++
+ # on MacOS it might be necessary to remove -DSEMINIT
+ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
+ -I./ \
+@@ -67,7 +68,7 @@
+ OUTIL = $(SUTIL:.c=.o)
+
+ cgx: $(OLIB) $(OUTIL) $(OULIB)
+- g++ $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
++ ${CXX} $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
+
+
+
diff --git a/srcpkgs/CalculiX-cgx/template b/srcpkgs/CalculiX-cgx/template
new file mode 100644
index 000000000000..8f5d5d48cd5a
--- /dev/null
+++ b/srcpkgs/CalculiX-cgx/template
@@ -0,0 +1,27 @@
+# Template file for 'CalculiX-cgx'
+pkgname=CalculiX-cgx
+version=2.20
+revision=1
+wrksrc=CalculiX
+_cgx_dir=cgx_${version}
+build_style="gnu-makefile"
+make_build_args="-C ${_cgx_dir}/src"
+makedepends="glu-devel libglvnd-devel libXmu-devel libXi-devel"
+depends="tetgen"
+short_desc="3D Structural Finite Element Program - Graphical interface"
+maintainer="Phicem <phicem@gmx.com>"
+license="GPL-2.0-or-later, custom:GLUT"
+homepage="http://www.dhondt.de/"
+distfiles="http://www.dhondt.de/cgx_${version}.all.tar.bz2"
+checksum=f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
+if [ "$XBPS_MACHINE" == "x86_64" ] ; then
+ hostmakedepends+="glibc-devel-32bit"
+fi
+CFLAGS=" -O2 -Wall -Wno-narrowing -I./ -I/usr/include/ -I/usr/include/GL -I../../libSNL/src -I../../glut-3.5/src -I/usr/X11/include"
+
+do_install() {
+ vbin ${_cgx_dir}/src/cgx
+ vlicense ${_cgx_dir}/README CGX_LICENSE
+ vlicense glut-3.5/NOTICE GLUT_LICENSE
+ vlicense ${FILESDIR}/README_LICENSES
+}
From d4fb2376653ab809c44208e70d05096c5fa9a4c5 Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 16 Oct 2022 13:56:56 +0200
Subject: [PATCH 05/22] New package: CalculiX-2.20
---
srcpkgs/CalculiX/template | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 srcpkgs/CalculiX/template
diff --git a/srcpkgs/CalculiX/template b/srcpkgs/CalculiX/template
new file mode 100644
index 000000000000..b807d972e945
--- /dev/null
+++ b/srcpkgs/CalculiX/template
@@ -0,0 +1,10 @@
+# Template file for 'CalculiX'
+pkgname=CalculiX
+version=2.20
+revision=1
+build_style=meta
+depends="CalculiX-cgx-${version}_${revision} CalculiX-ccx-${version}_${revision}"
+short_desc="3D Structural Finite Element Program"
+maintainer="Phicem <phicem@gmx.com>"
+license="GPL-2.0-only"
+homepage="http://www.dhondt.de/"
From 200c4ede685606972d177b58a311feafc0078f5f Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sat, 22 Oct 2022 10:50:09 +0200
Subject: [PATCH 06/22] Changed ccx description
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index b8728aacc1ff..dc58a9aec3d8 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -13,7 +13,7 @@ if [ "$XBPS_MACHINE" == "x86_64" ] && [ "$XBPS_TARGET_MACHINE" == "i686" ]; the
makedepends+=" libquadmath"
hostmakedepends+=" libgomp-devel-32bit"
fi
-short_desc="3D Structural Finite Element Program - Solver part"
+short_desc="3D Structural Finite Element Program - Solver"
maintainer="Phicem <phicem@gmx.com>"
license="GPL-2.0-or-later"
homepage="http://www.dhondt.de/"
From 16e2e045dad00492aa68e4e3adee055d51502b7e Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 11:35:51 +0200
Subject: [PATCH 07/22] Remove lines added during cross-compilation attemps
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-cgx/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/CalculiX-cgx/template b/srcpkgs/CalculiX-cgx/template
index 8f5d5d48cd5a..b5534017a9d5 100644
--- a/srcpkgs/CalculiX-cgx/template
+++ b/srcpkgs/CalculiX-cgx/template
@@ -14,9 +14,6 @@ license="GPL-2.0-or-later, custom:GLUT"
homepage="http://www.dhondt.de/"
distfiles="http://www.dhondt.de/cgx_${version}.all.tar.bz2"
checksum=f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
-if [ "$XBPS_MACHINE" == "x86_64" ] ; then
- hostmakedepends+="glibc-devel-32bit"
-fi
CFLAGS=" -O2 -Wall -Wno-narrowing -I./ -I/usr/include/ -I/usr/include/GL -I../../libSNL/src -I../../glut-3.5/src -I/usr/X11/include"
do_install() {
From e0ca24c70fb19407f81695383b1d2ad13342a070 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 12:00:27 +0200
Subject: [PATCH 08/22] Define custom post_extract instead of do_extract
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/tetgen/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/tetgen/template b/srcpkgs/tetgen/template
index c7e68d4cd672..c2f603ab440d 100644
--- a/srcpkgs/tetgen/template
+++ b/srcpkgs/tetgen/template
@@ -13,11 +13,11 @@ distfiles="http://www.dhondt.de/cgx_2.20.all.tar.bz2"
checksum=f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
make_check="no" # No tests provided
-do_extract() {
- local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
- tar -xvjf $srcdir/"$(basename ${distfiles})"
- pwd
- tar -xvf ${pkgname}${version}.tar
+post_extract() {
+ cd $XBPS_BUILDDIR
+ bsdtar -xvf ${pkgname}${version}.tar
+ rm -rf CalculiX
+ rm ${pkgname}${version}.tar
}
do_install() {
From e199a33b259317c195d3874614d45f3bcfc58a86 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 12:00:56 +0200
Subject: [PATCH 09/22] Use bsdtar instead of tar
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/tetgen/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/tetgen/template b/srcpkgs/tetgen/template
index c2f603ab440d..91549466fda9 100644
--- a/srcpkgs/tetgen/template
+++ b/srcpkgs/tetgen/template
@@ -4,7 +4,6 @@ version=1.5.1
revision=1
build_style="gnu-makefile"
make_cmd="make -C ${pkgname}${version} -f makefile"
-hostmakedepends="tar"
short_desc="Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"
maintainer="Phicem <phicem@gmx.com>"
license="AGPL-3.0-or-later"
From a45a0cf4bffe6ae840b544991536bb37e54f08fc Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 13:20:45 +0200
Subject: [PATCH 10/22] Removed unneeded lines with native i686 built
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 5 -----
1 file changed, 5 deletions(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index dc58a9aec3d8..eba376e3aa81 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -8,11 +8,6 @@ _LIBS=" ${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpac
hostmakedepends="perl gcc-fortran"
makedepends="SPOOLES arpack-ng-devel libgomp-devel openblas-devel"
_FFLAGS=" -Wall -O2 -fallow-argument-mismatch"
-
-if [ "$XBPS_MACHINE" == "x86_64" ] && [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
- makedepends+=" libquadmath"
- hostmakedepends+=" libgomp-devel-32bit"
-fi
short_desc="3D Structural Finite Element Program - Solver"
maintainer="Phicem <phicem@gmx.com>"
license="GPL-2.0-or-later"
From 2213c52e60eac627ba0ad0a949bc2a9ae8cffbf8 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 13:39:54 +0200
Subject: [PATCH 11/22] Remove xbps-src default CFLAGS repetition + removed
'-Wall' flag
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index eba376e3aa81..6f73fd319020 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -14,9 +14,9 @@ license="GPL-2.0-or-later"
homepage="http://www.dhondt.de/"
distfiles="http://www.dhondt.de/ccx_${version}.src.tar.bz2"
checksum=63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf
-CFLAGS=" -Wall -O2 -I ${XBPS_CROSS_BASE}/usr/include/SPOOLES-2.2 -DARCH='Linux' -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT"
-CFLAGS+=" ${XBPS_CROSS_CFLAGS}"
-_FFLAGS+=" ${XBPS_CROSS_CFLAGS}"
+
+FFLAGS="-fallow-argument-mismatch"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SPOOLES -DARCH=Linux -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT"
do_build() {
if [ "$CROSS_BUILD" ]; then
From 086d092f46f731a7ebe045d48a4e6c4fc541ca40 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Sun, 23 Oct 2022 13:42:49 +0200
Subject: [PATCH 12/22] Variable unused since previous commit
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index 6f73fd319020..2361bce81441 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -7,7 +7,6 @@ _ccx_dir=ccx_${version}
_LIBS=" ${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpack.so ${XBPS_CROSS_BASE}/lib/libopenblas.so -lpthread -lm -lc"
hostmakedepends="perl gcc-fortran"
makedepends="SPOOLES arpack-ng-devel libgomp-devel openblas-devel"
-_FFLAGS=" -Wall -O2 -fallow-argument-mismatch"
short_desc="3D Structural Finite Element Program - Solver"
maintainer="Phicem <phicem@gmx.com>"
license="GPL-2.0-or-later"
From 94edbc118cd4b970e506d08d659b9fdc238a1f84 Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 23 Oct 2022 18:50:12 +0200
Subject: [PATCH 13/22] Lowercased spooles package name
---
srcpkgs/{SPOOLES => spooles}/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename srcpkgs/{SPOOLES => spooles}/template (93%)
diff --git a/srcpkgs/SPOOLES/template b/srcpkgs/spooles/template
similarity index 93%
rename from srcpkgs/SPOOLES/template
rename to srcpkgs/spooles/template
index a533d24a89a8..9204e32ecaf9 100644
--- a/srcpkgs/SPOOLES/template
+++ b/srcpkgs/spooles/template
@@ -1,5 +1,5 @@
-# Template file for 'SPOOLES'
-pkgname=SPOOLES
+# Template file for 'spooles'
+pkgname=spooles
version=2.2
revision=1
create_wrksrc=yes
From 6aa25cdb334a3a448d43d4f8e0d05f9c2c3667aa Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 23 Oct 2022 20:24:24 +0200
Subject: [PATCH 14/22] Improved do_install for spooles (classabbyamp's
suggestion)
---
srcpkgs/spooles/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/spooles/template b/srcpkgs/spooles/template
index 9204e32ecaf9..65ea946085e5 100644
--- a/srcpkgs/spooles/template
+++ b/srcpkgs/spooles/template
@@ -14,12 +14,11 @@ distfiles="https://netlib.org/linalg/spooles/spooles.${version}.tgz"
checksum=a84559a0e987a1e423055ef4fdf3035d55b65bbe4bf915efaa1a35bef7f8c5dd
do_install() {
- vinstall spooles.a 755 usr/lib
- HEADERS_DIR=usr/include/SPOOLES-2.2
- for file in $(find -name '*.h') ; do
- dir=$(dirname ${file})
- vmkdir ${HEADERS_DIR}/${dir}
- vinstall ${file} 644 ${HEADERS_DIR}/${dir}
+ vinstall spooles.a 644 usr/lib
+ for file in *.h; do
+ vinstall ${file} 644 usr/include/$pkgname
+ done
+ for file in */*.h; do
+ vinstall ${file} 644 "usr/include/$pkgname/$(dirname $file)"
done
-
}
From e926aef0dd32680e6dd02333a2bac0475c0c07fd Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 23 Oct 2022 20:25:08 +0200
Subject: [PATCH 15/22] spooles: replaced hardcoded version number by a
variable
---
srcpkgs/spooles/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spooles/template b/srcpkgs/spooles/template
index 65ea946085e5..9b9fcfadbe1d 100644
--- a/srcpkgs/spooles/template
+++ b/srcpkgs/spooles/template
@@ -9,7 +9,7 @@ hostmakedepends="perl"
short_desc="SParse Object Oriented Linear Equations Solver"
maintainer="Phicem <phicem@gmx.com>"
license="Public Domain"
-homepage="https://netlib.org/linalg/spooles/spooles.2.2.html"
+homepage="https://netlib.org/linalg/spooles/spooles.${version}.html"
distfiles="https://netlib.org/linalg/spooles/spooles.${version}.tgz"
checksum=a84559a0e987a1e423055ef4fdf3035d55b65bbe4bf915efaa1a35bef7f8c5dd
From 13e434161ad46ab61b0437058f5eac29e7ceadb6 Mon Sep 17 00:00:00 2001
From: Phicem <phicem@gmx.com>
Date: Sun, 23 Oct 2022 20:51:22 +0200
Subject: [PATCH 16/22] cgx: removed unnecessary license file
---
srcpkgs/CalculiX-cgx/files/README_LICENSES | 5 -----
srcpkgs/CalculiX-cgx/template | 1 -
2 files changed, 6 deletions(-)
delete mode 100644 srcpkgs/CalculiX-cgx/files/README_LICENSES
diff --git a/srcpkgs/CalculiX-cgx/files/README_LICENSES b/srcpkgs/CalculiX-cgx/files/README_LICENSES
deleted file mode 100644
index 7b4d6ea22898..000000000000
--- a/srcpkgs/CalculiX-cgx/files/README_LICENSES
+++ /dev/null
@@ -1,5 +0,0 @@
-cgx program is released under GNU GPL v2 or later (except for a few functions, see CGX_LICENSE)
-
-To be compiled, this program makes use of other programs released under different licenses:
-* glut is released under a custom license (see GLUT_LICENSE)
-* libSN is released under GNU GPL v2 or later
diff --git a/srcpkgs/CalculiX-cgx/template b/srcpkgs/CalculiX-cgx/template
index b5534017a9d5..23a52dcc9ef2 100644
--- a/srcpkgs/CalculiX-cgx/template
+++ b/srcpkgs/CalculiX-cgx/template
@@ -20,5 +20,4 @@ do_install() {
vbin ${_cgx_dir}/src/cgx
vlicense ${_cgx_dir}/README CGX_LICENSE
vlicense glut-3.5/NOTICE GLUT_LICENSE
- vlicense ${FILESDIR}/README_LICENSES
}
From 2935e96c1576d8ec188f24544f31e7208aad53cc Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:45:43 +0200
Subject: [PATCH 17/22] cgx: clean patch
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-cgx/patches/Makefile.patch | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/CalculiX-cgx/patches/Makefile.patch b/srcpkgs/CalculiX-cgx/patches/Makefile.patch
index 2b9bd1b60462..dd2975a78dea 100644
--- a/srcpkgs/CalculiX-cgx/patches/Makefile.patch
+++ b/srcpkgs/CalculiX-cgx/patches/Makefile.patch
@@ -1,16 +1,12 @@
---- CalculiX/cgx_2.20/src/Makefile.orig 2022-07-29 11:41:00.438531485 +0200
-+++ CalculiX/cgx_2.20/src/Makefile 2022-10-15 13:34:33.978116884 +0200
-@@ -1,3 +1,4 @@
-+CXX=g++
- # on MacOS it might be necessary to remove -DSEMINIT
- CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
- -I./ \
-@@ -67,7 +68,7 @@
+--- a/CalculiX/cgx_2.20/src/Makefile
++++ b/CalculiX/cgx_2.20/src/Makefile
+@@ -67,7 +67,7 @@
OUTIL = $(SUTIL:.c=.o)
cgx: $(OLIB) $(OUTIL) $(OULIB)
- g++ $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
-+ ${CXX} $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
++ $(CXX) $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@
+
From 95ebabc4325ac9ce7040ab8000cae467add86d01 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:47:41 +0200
Subject: [PATCH 18/22] cgx: removed unneeded flags
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-cgx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/CalculiX-cgx/template b/srcpkgs/CalculiX-cgx/template
index 23a52dcc9ef2..91b011e856d9 100644
--- a/srcpkgs/CalculiX-cgx/template
+++ b/srcpkgs/CalculiX-cgx/template
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, custom:GLUT"
homepage="http://www.dhondt.de/"
distfiles="http://www.dhondt.de/cgx_${version}.all.tar.bz2"
checksum=f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
-CFLAGS=" -O2 -Wall -Wno-narrowing -I./ -I/usr/include/ -I/usr/include/GL -I../../libSNL/src -I../../glut-3.5/src -I/usr/X11/include"
+CFLAGS="-DSEMINIT -I. -I${XBPS_CROSS_BASE}/usr/include/GL -I${XBPS_CROSS_BASE}/usr/X11/include -I../../libSNL/src -I../../glut-3.5/src"
do_install() {
vbin ${_cgx_dir}/src/cgx
From c1db053cbf0a72a70dfbc6b65181515710050fee Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:55:53 +0200
Subject: [PATCH 19/22] ccx: replace (broken) perl script with sed calls
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index 2361bce81441..f7c4fa053797 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -17,6 +17,15 @@ checksum=63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf
FFLAGS="-fallow-argument-mismatch"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SPOOLES -DARCH=Linux -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT"
+post_patch() {
+ vsed -e 's,./date.pl; ,,' -i Makefile
+ # taken from date.pl, changed for reproducibility
+ vsed -e 's/You are using an executable made on.*/You are using an executable made on '"$(date --utc --date @$SOURCE_DATE_EPOCH +%Y-%m-%d)"'\\n");/g' \
+ -i ccx_$version.c -i CalculiXstep.c
+ vsed -e 's/COMPILETIME.*/COMPILETIME '"$(date --utc --date @$SOURCE_DATE_EPOCH +%Y-%m-%d)"'\\n",p1);/g' \
+ -i frd.c
+}
+
do_build() {
if [ "$CROSS_BUILD" ]; then
_xbps_cross_prefix="${XBPS_CROSS_TRIPLET}-"
From 6b189b12991a86ec459baa3b2ce5fc58f861c35e Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:56:32 +0200
Subject: [PATCH 20/22] Remove perl dependency (not needed anymore)
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index f7c4fa053797..2f411354c203 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -5,7 +5,7 @@ revision=1
wrksrc=CalculiX
_ccx_dir=ccx_${version}
_LIBS=" ${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpack.so ${XBPS_CROSS_BASE}/lib/libopenblas.so -lpthread -lm -lc"
-hostmakedepends="perl gcc-fortran"
+hostmakedepends="gcc-fortran"
makedepends="SPOOLES arpack-ng-devel libgomp-devel openblas-devel"
short_desc="3D Structural Finite Element Program - Solver"
maintainer="Phicem <phicem@gmx.com>"
From e17d3715d2b31362b74813f140c74ef11a77db2d Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 10:02:20 +0200
Subject: [PATCH 21/22] Use xbps-src variables instead of manually recreating
them
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index 2f411354c203..7736fa8bd4aa 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -27,10 +27,8 @@ post_patch() {
}
do_build() {
- if [ "$CROSS_BUILD" ]; then
- _xbps_cross_prefix="${XBPS_CROSS_TRIPLET}-"
- fi
- make -C ${_ccx_dir}/src CC="${_xbps_cross_prefix}gcc" FC="${_xbps_cross_prefix}gfortran" LIBS="$_LIBS" FFLAGS="$_FFLAGS" CFLAGS="$CFLAGS"
+ make CC="$CC" FC="$FC" CFLAGS="$CFLAGS" FFLAGS="$FFLAGS" \
+ LIBS="${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpack.so ${XBPS_CROSS_BASE}/usr/lib/libopenblas.so -lpthread -lm -lc"
}
do_install() {
From 6d65c9297584380475b3c7f56ee4f7c20335eab3 Mon Sep 17 00:00:00 2001
From: Phicem <82261758+Phicem@users.noreply.github.com>
Date: Wed, 26 Oct 2022 10:03:28 +0200
Subject: [PATCH 22/22] ccx: LIBS directly defined in the command line now
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/CalculiX-ccx/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/CalculiX-ccx/template b/srcpkgs/CalculiX-ccx/template
index 7736fa8bd4aa..b3ca1bfd2db4 100644
--- a/srcpkgs/CalculiX-ccx/template
+++ b/srcpkgs/CalculiX-ccx/template
@@ -4,7 +4,6 @@ version=2.20
revision=1
wrksrc=CalculiX
_ccx_dir=ccx_${version}
-_LIBS=" ${XBPS_CROSS_BASE}/usr/lib/spooles.a ${XBPS_CROSS_BASE}/usr/lib/libarpack.so ${XBPS_CROSS_BASE}/lib/libopenblas.so -lpthread -lm -lc"
hostmakedepends="gcc-fortran"
makedepends="SPOOLES arpack-ng-devel libgomp-devel openblas-devel"
short_desc="3D Structural Finite Element Program - Solver"
next prev parent reply other threads:[~2022-10-26 8:03 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-16 10:05 [PR PATCH] CalculiX-2.20 Phicem
2022-10-16 10:21 ` [PR REVIEW] CalculiX-2.20 classabbyamp
2022-10-16 10:21 ` classabbyamp
2022-10-16 11:22 ` Phicem
2022-10-16 11:23 ` paper42
2022-10-16 11:23 ` paper42
2022-10-16 11:37 ` Phicem
2022-10-16 11:46 ` Phicem
2022-10-16 18:27 ` [PR PATCH] [Updated] CalculiX-2.20 Phicem
2022-10-16 18:30 ` [PR REVIEW] CalculiX-2.20 Phicem
2022-10-16 18:33 ` CalculiX-2.20 Phicem
2022-10-16 19:38 ` [PR PATCH] [Updated] CalculiX-2.20 Phicem
2022-10-16 19:40 ` CalculiX-2.20 Phicem
2022-10-16 20:41 ` CalculiX-2.20 Phicem
2022-10-17 23:56 ` [PR REVIEW] CalculiX-2.20 classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-17 23:56 ` classabbyamp
2022-10-18 2:34 ` ahesford
2022-10-18 2:34 ` ahesford
2022-10-18 6:38 ` 0x5c
2022-10-18 6:42 ` classabbyamp
2022-10-22 7:49 ` CalculiX-2.20 Phicem
2022-10-22 8:07 ` [PR REVIEW] [WIP] CalculiX-2.20 Phicem
2022-10-22 8:10 ` Phicem
2022-10-22 8:48 ` Phicem
2022-10-22 8:50 ` [PR PATCH] [Updated] " Phicem
2022-10-22 9:03 ` [PR REVIEW] " Phicem
2022-10-22 11:55 ` 0x5c
2022-10-22 11:55 ` 0x5c
2022-10-22 19:17 ` Phicem
2022-10-23 7:11 ` 0x5c
2022-10-23 9:35 ` Phicem
2022-10-23 9:35 ` [PR PATCH] [Updated] " Phicem
2022-10-23 9:59 ` [PR REVIEW] " Phicem
2022-10-23 10:00 ` [PR PATCH] [Updated] " Phicem
2022-10-23 10:00 ` Phicem
2022-10-23 11:20 ` Phicem
2022-10-23 11:39 ` Phicem
2022-10-23 11:42 ` Phicem
2022-10-23 13:14 ` [PR REVIEW] " ahesford
2022-10-23 13:15 ` ahesford
2022-10-23 13:25 ` ahesford
2022-10-23 16:50 ` [PR PATCH] [Updated] " Phicem
2022-10-23 16:52 ` [PR REVIEW] " Phicem
2022-10-23 18:25 ` [PR PATCH] [Updated] " Phicem
2022-10-23 18:29 ` [PR REVIEW] " Phicem
2022-10-23 18:49 ` Phicem
2022-10-23 18:51 ` [PR PATCH] [Updated] " Phicem
2022-10-23 19:56 ` [PR REVIEW] " Phicem
2022-10-23 20:02 ` classabbyamp
2022-10-26 6:37 ` Phicem
2022-10-26 7:45 ` [PR PATCH] [Updated] " Phicem
2022-10-26 7:47 ` Phicem
2022-10-26 7:55 ` Phicem
2022-10-26 7:56 ` Phicem
2022-10-26 8:02 ` Phicem
2022-10-26 8:03 ` Phicem [this message]
2022-10-26 8:13 ` Phicem
2022-10-26 8:13 ` Phicem
2022-10-26 9:35 ` [PR REVIEW] " Phicem
2022-10-26 9:37 ` [PR PATCH] [Updated] " Phicem
2022-10-26 9:41 ` Phicem
2022-10-26 10:01 ` Phicem
2022-10-26 10:46 ` Phicem
2022-10-26 16:42 ` Phicem
2022-10-26 19:18 ` Phicem
2022-10-26 19:25 ` [PR REVIEW] " Phicem
2022-10-30 20:31 ` [PR PATCH] [Updated] " Phicem
2022-10-31 14:17 ` Phicem
2022-10-31 14:25 ` Phicem
2022-10-31 16:45 ` Phicem
2022-11-04 21:44 ` New package: CalculiX-2.20 classabbyamp
2022-11-04 21:44 ` classabbyamp
2022-11-05 15:38 ` Phicem
2022-11-05 15:38 ` [PR PATCH] [Updated] " Phicem
2022-11-05 17:48 ` Phicem
2023-02-04 1:58 ` github-actions
2023-02-05 18:21 ` [PR PATCH] [Updated] " Phicem
2023-05-08 1:52 ` github-actions
2023-05-22 1:57 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221026080331.FUTWSTm9C4EX5tJeXcObVHCi5DXmpF9491L4mafkcug@z \
--to=phicem@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).