Ticket #50810: patch-calculix-build.diff

calculix-2.10/src

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

calculix-2.10/src

@@ -22 +22 @@
 
 LIBS = \
        $(DIR)/spooles.a \
-        ../../../ARPACK/libarpack_INTEL.a \
-       -lpthread -lm -lc
+       $(shell pkg-config --libs arpack) -lvecLibFort
 
-ccx_2.10: $(OCCXMAIN) ccx_2.10.a  $(LIBS)
-        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
+ccx_2.10: $(OCCXMAIN) ccx_2.10.a
+        ./date.pl
+        $(CC) $(CFLAGS) -c ccx_2.10.c
+        $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
 
 ccx_2.10.a: $(OCCXF) $(OCCXC)
         ar vr $@ $?
-                                                                               
+
+clean:
+        rm -f *.o *.a

calculix-2.10/src

@@ -133 +133 @@
 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 5. Mär 12:23:33 CET 2016\n");
+printf("You are using an executable made on __DATE__ __TIME__\n");
 fflush(stdout);
 
 istep=0;

calculix-2.10/src

@@ -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;
 }