diff options
Diffstat (limited to 'cad/calculix/files/patch-ccx_VER+src+Makefile')
| -rw-r--r-- | cad/calculix/files/patch-ccx_VER+src+Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile index 45750f7b3056..05c4e99b2269 100644 --- a/cad/calculix/files/patch-ccx_VER+src+Makefile +++ b/cad/calculix/files/patch-ccx_VER+src+Makefile @@ -1,11 +1,11 @@ ---- ccx_2.9/src/Makefile.orig 2015-11-19 19:28:14 UTC -+++ ccx_2.9/src/Makefile -@@ -1,10 +1,10 @@ +--- ccx_2.10/src/Makefile.orig 2016-03-05 11:18:03 UTC ++++ ccx_2.10/src/Makefile +@@ -1,9 +1,9 @@ --CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -+CFLAGS += -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE - #FFLAGS = -Wall -O3 -fopenmp -fmax-stack-var-size=80000 - FFLAGS = -Wall -O3 -fopenmp +-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +-FFLAGS = -Wall -O3 -fopenmp ++CFLAGS += -O3 -fopenmp -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE ++FFLAGS += -O3 -fopenmp -CC=cc -FC=gfortran @@ -14,7 +14,7 @@ .c.o : $(CC) $(CFLAGS) -c $< -@@ -19,15 +19,10 @@ OCCXF = $(SCCXF:.f=.o) +@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -26,9 +26,9 @@ - -lpthread -lm -lc +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm - ccx_2.9: $(OCCXMAIN) ccx_2.9.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a $(LIBS) -+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a -lpthread $(LIBS) + 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) ++ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a -lpthread $(LIBS) - ccx_2.9.a: $(OCCXF) $(OCCXC) + ccx_2.10.a: $(OCCXF) $(OCCXC) ar vr $@ $? |