diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-09-02 01:45:56 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-09-02 01:45:56 +0000 |
| commit | 890254d86b77a33cf8a4e5b9f6a508648f023e59 (patch) | |
| tree | 4a415b4dd3f27f7d174ca0c555566ed2174e9243 /cad/calculix/files/patch-ccx_VER+src+Makefile | |
| parent | bf62df48654a788aed492639fdb3272092d1beac (diff) | |
| download | ports-890254d86b77a33cf8a4e5b9f6a508648f023e59.tar.gz ports-890254d86b77a33cf8a4e5b9f6a508648f023e59.zip | |
Notes
Diffstat (limited to 'cad/calculix/files/patch-ccx_VER+src+Makefile')
| -rw-r--r-- | cad/calculix/files/patch-ccx_VER+src+Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile index 0ef4089fa5cf..bbf2e4e44887 100644 --- a/cad/calculix/files/patch-ccx_VER+src+Makefile +++ b/cad/calculix/files/patch-ccx_VER+src+Makefile @@ -1,35 +1,35 @@ ---- ccx_1.7/src/Makefile.orig Sun Mar 4 02:34:11 2007 -+++ ccx_1.7/src/Makefile Sun Mar 25 14:25:45 2007 -@@ -1,8 +1,8 @@ +--- ccx_1.8/src/Makefile.orig 2008-08-01 04:24:46.000000000 +0900 ++++ ccx_1.8/src/Makefile 2008-09-02 10:20:15.000000000 +0900 +@@ -1,9 +1,9 @@ + -CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -FFLAGS = -Wall -O +CFLAGS+= -Wall -O -I. -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE %%PTHREAD_CFLAGS%% +FFLAGS+= -Wall -O -CC=cc --FC=g77 +-FC=gfortran +CC=%%CC%% +FC=%%FC%% .c.o : $(CC) $(CFLAGS) -c $< -@@ -379,15 +379,12 @@ +@@ -462,15 +462,12 @@ OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) -DIR=../../../SPOOLES.2.2 -- ++DIR=%%LOCALBASE%%/lib + -LIBS = \ - $(DIR)/spooles.a \ - ../../../ARPACK/libarpack_INTEL.a \ - -lm -+DIR=%%LOCALBASE%%/lib -+ -+LIBS = -lspooles -larpack -ltaucs -lmetis %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm ++LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm - ccx_1.7: $(OCCXMAIN) ccx_1.7.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_1.7.c; g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.7.a $(LIBS) -+ ./date.pl; $(CC) $(CFLAGS) -c ccx_1.7.c; ${FC} ${FFLAGS} -o $@ $(OCCXMAIN) ccx_1.7.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat + ccx_1.8: $(OCCXMAIN) ccx_1.8.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; gfortran -Wall -O -o $@ $(OCCXMAIN) ccx_1.8.a $(LIBS) ++ ./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; ${FC} ${FFLAGS} -O -o $@ $(OCCXMAIN) ccx_1.8.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat - ccx_1.7.a: $(OCCXF) $(OCCXC) + ccx_1.8.a: $(OCCXF) $(OCCXC) ar vr $@ $? |