Ticket #57715: patch-ccx-build.diff

File patch-ccx-build.diff, 2.4 KB (added by mbrethen, 6 years ago)
  • CalculiX.h

    diff -ur src.orig/CalculiX.h src/CalculiX.h
    old new  
    1616/*     along with this program; if not, write to the Free Software       */
    1717/*     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         */
    1818
     19/* mac include pthread_t.h */
     20#include <pthread.h>
     21
    1922#define Linux 1
    2023#define IRIX 2
    2124#define IRIX64 3
  • Makefile

    diff -ur src.orig/Makefile src/Makefile
    old new  
    11
    2 CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
    3 FFLAGS = -Wall -O3
     2CFLAGS=-O2 -pthread -I@@PREFIX@@/include -I@@PREFIX@@/include/spooles -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DUSE_MT -DTAUCS -DBLAS_LIBRARIES=vecLibFort -DLAPACK_LIBRARIES=vecLibFort
     3FFLAGS=-O2 -fopenmp
    44
    5 CC=cc
    6 FC=gfortran
     5CC=@@CC@@
     6FC=@@FC@@
    77
    88.c.o :
    99        $(CC) $(CFLAGS) -c $<
     
    2121DIR=../../../SPOOLES.2.2
    2222
    23 LIBS = \
    24        $(DIR)/spooles.a \
    25         ../../../ARPACK/libarpack_INTEL.a \
    26        -lpthread -lm -lc
     23LIBS = -ltaucs -lmetis -lspooles -larpack -lvecLibFort
    2724
    28 ccx_2.14: $(OCCXMAIN) ccx_2.14.a  $(LIBS)
    29         ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC)  -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS)
     25ccx_2.14: $(OCCXMAIN) ccx_2.14.a
     26        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS) $(LDFLAGS)
    3027
    3128ccx_2.14.a: $(OCCXF) $(OCCXC)
    3229        ar vr $@ $?
     30
     31clean:
     32        rm -f *.o *.a
  • ccx_2.14.c

    diff -ur src.orig/ccx_2.14.c src/ccx_2.14.c
    old new  
    136136printf("software, and you are welcome to redistribute it under\n");
    137137printf("certain conditions, see gpl.htm\n\n");
    138138printf("************************************************************\n\n");
    139 printf("You are using an executable made on Sa 28. Apr 16:09:10 CEST 2018\n");
     139printf("You are using an executable made on __DATE__ __TIME__\n");
    140140fflush(stdout);
    141141
    142142istep=0;
  • u_free.c

    diff -ur src.orig/u_free.c 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}