Ticket #57715: patch-ccx-build.diff

CalculiX.h

@@ -16 +16 @@
 /*     along with this program; if not, write to the Free Software       */
 /*     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         */
 
+/* mac include pthread_t.h */
+#include <pthread.h>
+
 #define Linux 1
 #define IRIX 2
 #define IRIX64 3

Makefile

@@ -1 +1 @@
 
-CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-FFLAGS = -Wall -O3 
+CFLAGS=-O2 -pthread -I@@PREFIX@@/include -I@@PREFIX@@/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DUSE_MT -DTAUCS -DBLAS_LIBRARIES=vecLibFort -DLAPACK_LIBRARIES=vecLibFort
+FFLAGS=-O2 -fopenmp 
 
-CC=cc
-FC=gfortran
+CC=@@CC@@
+FC=@@FC@@
 
 .c.o :
         $(CC) $(CFLAGS) -c $<
@@ -21 +21 @@
 DIR=../../../SPOOLES.2.2
 
-LIBS = \
-       $(DIR)/spooles.a \
-        ../../../ARPACK/libarpack_INTEL.a \
-       -lpthread -lm -lc
+LIBS = -ltaucs -lmetis -lspooles -larpack -lvecLibFort
 
-ccx_2.14: $(OCCXMAIN) ccx_2.14.a  $(LIBS)
-        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC)  -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS)
+ccx_2.14: $(OCCXMAIN) ccx_2.14.a
+        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS) $(LDFLAGS)
 
 ccx_2.14.a: $(OCCXF) $(OCCXC)
         ar vr $@ $?
+
+clean:
+        rm -f *.o *.a

ccx_2.14.c

@@ -136 +136 @@
 printf("software, and you are welcome to redistribute it under\n");
 printf("certain conditions, see gpl.htm\n\n");
 printf("************************************************************\n\n");
-printf("You are using an executable made on Sa 28. Apr 16:09:10 CEST 2018\n");
+printf("You are using an executable made on __DATE__ __TIME__\n");
 fflush(stdout);
 
 istep=0;

u_free.c

@@ -41 +41 @@
   if(log_realloc==1) {
       printf("FREEING of variable %s, file %s, line=%d: oldaddress= %ld\n",ptr_name,file,line,(long int)ptr);
   }      
-  return;
+  return NULL;
 }