Ticket #50810: patch-calculix-build.diff

File patch-calculix-build.diff, 2.2 KB (added by ian.rees@…, 9 years ago)
  • calculix-2.10/src

    diff -ur calculix-2.10/src.orig/CalculiX.h calculix-2.10/src/CalculiX.h
    old new  
    1515/*     along with this program; if not, write to the Free Software       */
    1616/*     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         */
    1717
     18#include<pthread.h>
    1819#define Linux 1
    1920#define IRIX 2
    2021#define IRIX64 3
  • calculix-2.10/src

    diff -ur calculix-2.10/src.orig/Makefile calculix-2.10/src/Makefile
    old new  
    2222
    2323LIBS = \
    2424       $(DIR)/spooles.a \
    25         ../../../ARPACK/libarpack_INTEL.a \
    26        -lpthread -lm -lc
     25       $(shell pkg-config --libs arpack) -lvecLibFort
    2726
    28 ccx_2.10: $(OCCXMAIN) ccx_2.10.a  $(LIBS)
    29         ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
     27ccx_2.10: $(OCCXMAIN) ccx_2.10.a
     28        ./date.pl
     29        $(CC) $(CFLAGS) -c ccx_2.10.c
     30        $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
    3031
    3132ccx_2.10.a: $(OCCXF) $(OCCXC)
    3233        ar vr $@ $?
    33                                                                                
     34
     35clean:
     36        rm -f *.o *.a
  • calculix-2.10/src

    diff -ur calculix-2.10/src.orig/ccx_2.10.c calculix-2.10/src/ccx_2.10.c
    old new  
    133133printf("software, and you are welcome to redistribute it under\n");
    134134printf("certain conditions, see gpl.htm\n\n");
    135135printf("************************************************************\n\n");
    136 printf("You are using an executable made on Sa 5. Mär 12:23:33 CET 2016\n");
     136printf("You are using an executable made on __DATE__ __TIME__\n");
    137137fflush(stdout);
    138138
    139139istep=0;
  • calculix-2.10/src

    diff -ur calculix-2.10/src.orig/u_free.c calculix-2.10/src/u_free.c
    old new  
    4141  if(log_realloc==1) {
    4242      printf("FREEING of variable %s, file %s, line=%d: oldaddress= %ld\n",ptr_name,file,line,(long int)ptr);
    4343  }     
    44   return;
     44  return NULL;
    4545}