diff options
| author | Maurizio D'Addona | 2016-08-08 10:04:31 +0200 |
|---|---|---|
| committer | Maurizio D'Addona | 2016-08-08 11:22:01 +0200 |
| commit | 7f9ef54c62a38ac034ca2479568c55639355cf3c (patch) | |
| tree | 5991f764c77ddbe58bfc9874f3f77fa9cea1f155 /calculix_2.11_archlinux.patch | |
| parent | 79be0728df11a9c612fc2f9b8e5b0d208e14eb60 (diff) | |
| download | aur-7f9ef54c62a38ac034ca2479568c55639355cf3c.tar.gz | |
Update to version 2.11
Diffstat (limited to 'calculix_2.11_archlinux.patch')
| -rw-r--r-- | calculix_2.11_archlinux.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/calculix_2.11_archlinux.patch b/calculix_2.11_archlinux.patch new file mode 100644 index 000000000000..0c80b9818116 --- /dev/null +++ b/calculix_2.11_archlinux.patch @@ -0,0 +1,71 @@ +diff -ur CalculiX_orig/ccx_2.11/src/Makefile CalculiX/ccx_2.11/src/Makefile +--- CalculiX_orig/ccx_2.11/src/Makefile ++++ CalculiX/ccx_2.11/src/Makefile +@@ -2,2 +2,2 @@ +-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT ++CFLAGS = -Wall -O3 -fopenmp -I /usr/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT + FFLAGS = -Wall -O3 -fopenmp +@@ -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 +diff -ur CalculiX_orig/cgx_2.11/src/Makefile CalculiX/cgx_2.11/src/Makefile +--- CalculiX_orig/cgx_2.11/src/Makefile ++++ CalculiX/cgx_2.11/src/Makefile +@@ -1,14 +1,8 @@ + CFLAGS = -O3 -Wall \ + -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.11/src/cgx.h CalculiX/cgx_2.11/src/cgx.h +--- CalculiX_orig/cgx_2.11/src/cgx.h ++++ CalculiX/cgx_2.11/src/cgx.h +@@ -81,8 +81,8 @@ + #elif defined AFLIB +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html",\ +- "/usr/local/CalculiX/cgx_2.11/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"} + #else +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html"} ++ #define HELPFILE {"/usr/share/doc/cgx/cgx.html",\ ++ "/usr/share/doc/ccx/ccx.html"} + #endif +diff -ur CalculiX_orig/cgx_2.11/src/uselibSNL.h CalculiX/cgx_2.11/src/uselibSNL.h +--- CalculiX_orig/cgx_2.11/src/uselibSNL.h ++++ CalculiX/cgx_2.11/src/uselibSNL.h +@@ -8,1 +8,3 @@ + #include <cgx.h> ++#undef max ++#undef min +diff -ur CalculiX_orig/cgx_2.11/src/uselibSNL.cpp CalculiX/cgx_2.11/src/uselibSNL.cpp +--- CalculiX_orig/cgx_2.11/src/uselibSNL.cpp ++++ CalculiX/cgx_2.11/src/uselibSNL.cpp +@@ -1243,3 +1243,3 @@ + char buffer[MAX_LINE_LENGTH]; +- int foundPntAtPole[2]={0.,0.}, foundPntAtMeridian[2]={0.,0.}; ++ int foundPntAtPole[2]={0,0}, foundPntAtMeridian[2]={0,0}; + double umin, umax,vmin,vmax, du,dv; |