diff options
Diffstat (limited to 'calculix_2.16_archlinux.patch')
| -rwxr-xr-x | calculix_2.16_archlinux.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/calculix_2.16_archlinux.patch b/calculix_2.16_archlinux.patch index 5279f95f1831..a6050cdf5001 100755 --- a/calculix_2.16_archlinux.patch +++ b/calculix_2.16_archlinux.patch @@ -13,9 +13,9 @@ diff -ur CalculiX_orig/ccx_2.16/src/Makefile CalculiX/ccx_2.16/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -diff -ur CalculiX_orig/cgx_2.16/src/Makefile CalculiX/cgx_2.16/src/Makefile ---- CalculiX_orig/cgx_2.16/src/Makefile -+++ CalculiX/cgx_2.16/src/Makefile +diff -ur CalculiX_orig/cgx_2.16.1/src/Makefile CalculiX/cgx_2.16/src/Makefile +--- CalculiX_orig/cgx_2.16-1/src/Makefile ++++ CalculiX/cgx_2.16.1/src/Makefile @@ -1,14 +1,8 @@ CFLAGS = -O3 -Wall \ -I./ \ @@ -37,26 +37,26 @@ diff -ur CalculiX_orig/cgx_2.16/src/Makefile CalculiX/cgx_2.16/src/Makefile @@ -59,1 +53,1 @@ - ../../libSNL/src/*.cpp +# ../../libSNL/src/*.cpp -diff -ur CalculiX_orig/cgx_2.16/src/cgx.h CalculiX/cgx_2.16/src/cgx.h ---- CalculiX_orig/cgx_2.16/src/cgx.h -+++ CalculiX/cgx_2.16/src/cgx.h +diff -ur CalculiX_orig/cgx_2.16.1/src/cgx.h CalculiX/cgx_2.16/src/cgx.h +--- CalculiX_orig/cgx_2.16.1/src/cgx.h ++++ CalculiX/cgx_2.16.1/src/cgx.h @@ -81,8 +81,8 @@ #elif defined AFLIB -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\ +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\ - "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\ - "/usr/local/CalculiX/cgx_2.8/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.16/doc/cgx/cgx.html",\ +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\ - "/usr/local/CalculiX/ccx_2.16/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.16/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h ---- CalculiX_orig/cgx_2.16/src/uselibSNL.h -+++ CalculiX/cgx_2.16/src/uselibSNL.h +diff -ur CalculiX_orig/cgx_2.16.1/src/uselibSNL.h CalculiX/cgx_2.16/src/uselibSNL.h +--- CalculiX_orig/cgx_2.16.1/src/uselibSNL.h ++++ CalculiX/cgx_2.16.1/src/uselibSNL.h @@ -8,1 +8,3 @@ #include <cgx.h> +#undef max |