diff options
| author | Maurizio D'Addona | 2020-08-04 14:39:28 +0200 |
|---|---|---|
| committer | Maurizio D'Addona | 2020-08-04 14:39:28 +0200 |
| commit | 163bd20f57ed2f178be664b1402b4e321c08804c (patch) | |
| tree | 9b1b37af13c8350bbbf359c162eb04239ad3f361 /calculix_2.17_archlinux.patch | |
| parent | 3772d99cf917a34dbc0fd1b211f114abf511901d (diff) | |
| download | aur-163bd20f57ed2f178be664b1402b4e321c08804c.tar.gz | |
Update to version 2.17
Diffstat (limited to 'calculix_2.17_archlinux.patch')
| -rwxr-xr-x | calculix_2.17_archlinux.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/calculix_2.17_archlinux.patch b/calculix_2.17_archlinux.patch new file mode 100755 index 000000000000..584ddb8982ea --- /dev/null +++ b/calculix_2.17_archlinux.patch @@ -0,0 +1,68 @@ +diff -ur CalculiX_orig/ccx_2.17/src/Makefile CalculiX/ccx_2.17/src/Makefile +--- CalculiX_orig/ccx_2.17/src/Makefile ++++ CalculiX/ccx_2.17/src/Makefile +@@ -2,2 +2,2 @@ +-CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT +-FFLAGS = -Wall -O2 ++CFLAGS = -Wall -O2 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT ++FFLAGS = -Wall -O2 -fallow-argument-mismatch +@@ -21,6 +21,1 @@ +-DIR=../../../SPOOLES.2.2 +- +-LIBS = \ +- $(DIR)/spooles.a \ +- ../../../ARPACK/libarpack_INTEL.a \ +- -lpthread -lm -lc ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack +diff -ur CalculiX_orig/cgx_2.17/src/Makefile CalculiX/cgx_2.16/src/Makefile +--- CalculiX_orig/cgx_2.17/src/Makefile ++++ CalculiX/cgx_2.17/src/Makefile +@@ -1,14 +1,8 @@ + 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 ++ -I/usr/include/libSNL \ ++ -I../../glut-3.5/src + +-LFLAGS = \ +- -L/usr/lib64 -lGL -lGLU \ +- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ +- -lm -lpthread -lrt ++LFLAGS = -lGL -lGLU -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE -lSNL -lm -lpthread -lrt + + +@@ -59,1 +53,1 @@ +- ../../libSNL/src/*.cpp ++# ../../libSNL/src/*.cpp +diff -ur CalculiX_orig/cgx_2.17/src/cgx.h CalculiX/cgx_2.17/src/cgx.h +--- CalculiX_orig/cgx_2.17/src/cgx.h ++++ CalculiX/cgx_2.17/src/cgx.h +@@ -85,12 +85,12 @@ + #elif defined AFLIB +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.17/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.17/doc/ccx/ccx.html",\ +- "/usr/local/CalculiX/cgx_2.16/doc/aflib/aflib.pdf"} ++ #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ ++ "/usr/share/doc/doc/ccx/ccx.html",\ ++ "/usr/share/doc/doc/aflib/aflib.pdf"} + /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */ + #define TETMESHER 1 + #else +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.17/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.17/doc/ccx/ccx.html"} ++ #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ ++ "/usr/share/doc/ccx/ccx.html"} + /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */ + #define TETMESHER 1 + #endif +diff -ur CalculiX_orig/cgx_2.17/src/uselibSNL.h CalculiX/cgx_2.17/src/uselibSNL.h +--- CalculiX_orig/cgx_2.17/src/uselibSNL.h ++++ CalculiX/cgx_2.17/src/uselibSNL.h +@@ -8,1 +8,3 @@ + #include <cgx.h> ++#undef max ++#undef min |