diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2010-08-13 06:40:41 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2010-08-13 06:40:41 +0000 |
| commit | 40b4a402c9d649fec766acb1cde6c3d858bb717b (patch) | |
| tree | acea6fb4e41aeb9c169a4c07a6c3e360e32f6a6a | |
| parent | Update to 2.2. (diff) | |
Fix sizemismatch.
According to CalculiX/ccx_2.2/src/LOGBOOK,
> 5 Aug 2010 - made some small corrections
Spotted by: QAT
Notes
Notes:
svn path=/head/; revision=259158
| -rw-r--r-- | cad/calculix/distinfo | 6 | ||||
| -rw-r--r-- | cad/calculix/files/patch-ccx_VER+src+Makefile | 36 |
2 files changed, 13 insertions, 29 deletions
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo index 33c2dd8ce255..aaafc9d7ec3a 100644 --- a/cad/calculix/distinfo +++ b/cad/calculix/distinfo @@ -1,6 +1,6 @@ -MD5 (calculix/ccx_2.2.src.tar.bz2) = 7e2a020edfcfd48d5c067eb1fb9603af -SHA256 (calculix/ccx_2.2.src.tar.bz2) = 96f0b5295df33b78c6789ee10f8441d211bab9eef342119d1ee41532011bf823 -SIZE (calculix/ccx_2.2.src.tar.bz2) = 720102 +MD5 (calculix/ccx_2.2.src.tar.bz2) = 085da9e39fbc386f85e97ce8d8af2c71 +SHA256 (calculix/ccx_2.2.src.tar.bz2) = 88672b95b8241041cc12e90f8d7e3ad9cb05b11dbb07ae4f0230355f31dece0e +SIZE (calculix/ccx_2.2.src.tar.bz2) = 719861 MD5 (calculix/cgx_2.2.all.tar.bz2) = 85470f0ef2957d7f94cadb82235775ca SHA256 (calculix/cgx_2.2.all.tar.bz2) = 216a1102ac3d7765d10f1f4c78db11e974e50615d6cf08b4019000b6119a019a SIZE (calculix/cgx_2.2.all.tar.bz2) = 1357357 diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile index e6db256c9b81..6029634a0b7b 100644 --- a/cad/calculix/files/patch-ccx_VER+src+Makefile +++ b/cad/calculix/files/patch-ccx_VER+src+Makefile @@ -1,33 +1,17 @@ ---- ccx_2.2/src/Makefile.orig 2010-02-21 23:46:55.000000000 +0900 -+++ ccx_2.2/src/Makefile 2010-06-06 08:45:41.000000000 +0900 +--- ccx_2.2/src/Makefile.orig 2010-08-07 21:20:37.000000000 +0900 ++++ ccx_2.2/src/Makefile 2010-08-13 15:38:34.000000000 +0900 @@ -1,9 +1,9 @@ --CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -+CFLAGS = -Wall -O -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE - FFLAGS = -Wall -O -fopenmp - +-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +-FFLAGS = -Wall -O3 -fopenmp +- -CC=cc -FC=gfortran -+CC=%%CC%% -+FC=%%FC%% ++CFLAGS = -Wall -O -I/usr/local/include -I/usr/local/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE ++FFLAGS = -Wall -O -fopenmp ++ ++CC=gcc44 ++FC=gfortran44 .c.o : $(CC) $(CFLAGS) -c $< -@@ -18,15 +18,10 @@ - OCCXC = $(SCCXC:.c=.o) - OCCXMAIN = $(SCCXMAIN:.c=.o) - --DIR=../../../SPOOLES.2.2 -- --LIBS = \ -- $(DIR)/spooles.a \ -- ../../../ARPACK/libarpack_INTEL.a \ -- -lm -lc -+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm - - ccx_2.2: $(OCCXMAIN) ccx_2.2.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.2.a -lpthread $(LIBS) -+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.2.a %%PTHREAD_LIBS%% -L%%LOCALBASE%%/lib $(LIBS) - - ccx_2.2.a: $(OCCXF) $(OCCXC) - ar vr $@ $? |