diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-04-25 07:09:18 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-04-25 07:09:18 +0000 |
| commit | 2d9be844d8ce1569c40b4af9eb3853de3e36a8fa (patch) | |
| tree | 1de7ffba41a46df846c1b8db04198cb90923e7af /math | |
| parent | - Update to 2.9 (diff) | |
Better handling of shared lib.
PR: 166703
Submitted by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
Notes
Notes:
svn path=/head/; revision=295453
Diffstat (limited to 'math')
| -rw-r--r-- | math/superlu/Makefile | 4 | ||||
| -rw-r--r-- | math/superlu/files/patch-SRC-Makefile | 27 | ||||
| -rw-r--r-- | math/superlu/files/patch-make.inc | 24 | ||||
| -rw-r--r-- | math/superlu/pkg-plist | 1 |
4 files changed, 41 insertions, 15 deletions
diff --git a/math/superlu/Makefile b/math/superlu/Makefile index 17cee82d2ddd..a5ac045e5491 100644 --- a/math/superlu/Makefile +++ b/math/superlu/Makefile @@ -68,7 +68,9 @@ do-install: ${PREFIX}/lib/libsuperlu.a ${INSTALL_DATA} ${WRKSRC}/libsuperlu_${P_VERSION}.so \ ${PREFIX}/lib/libsuperlu.so.${PORTREVISION} - ${LN} -s ${PREFIX}/lib/libsuperlu.so.${PORTREVISION} \ + ${LN} -fs ${PREFIX}/lib/libsuperlu.so.${PORTREVISION} \ + ${PREFIX}/lib/libsuperlu_${P_VERSION}.so + ${LN} -fs ${PREFIX}/lib/libsuperlu_${P_VERSION}.so \ ${PREFIX}/lib/libsuperlu.so @${MKDIR} ${PREFIX}/include/superlu ${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${PREFIX}/include/superlu diff --git a/math/superlu/files/patch-SRC-Makefile b/math/superlu/files/patch-SRC-Makefile index 43c1b6af03de..b97513e4043c 100644 --- a/math/superlu/files/patch-SRC-Makefile +++ b/math/superlu/files/patch-SRC-Makefile @@ -1,6 +1,6 @@ --- SRC/Makefile.orig 2006-01-06 00:09:14.000000000 +0100 -+++ SRC/Makefile 2012-03-13 15:14:50.000000000 +0100 -@@ -89,28 +89,31 @@ ++++ SRC/Makefile 2012-04-06 20:56:28.000000000 +0200 +@@ -89,39 +89,47 @@ zcolumn_dfs.o zcolumn_bmod.o zpivotL.o zpruneL.o \ zmemory.o zutil.o zmyblas2.o @@ -32,13 +32,28 @@ $(RANLIB) ../$(SUPERLULIB) +shared: single double complex complex16 -+ $(CC) -shared -Wl,-soname=$(SUPERLULIB_SHARED) -o ../$(SUPERLULIB_SHARED) ../$(SUPERLULIB) ++ $(CC) -shared -Wl,-soname=$(SUPERLULIB_SHARED) -o ../$(SUPERLULIB_SHARED) \ ++ $(ALLAUX) $(LAAUX) $(SCLAUX) $(DZLAUX) \ ++ $(SLUSRC) $(SLASRC) \ ++ $(DLUSRC) $(DLASRC) \ ++ $(CLUSRC) $(CLASRC) \ ++ $(ZLUSRC) $(ZLASRC) + ################################## # Do not optimize these routines # -@@ -125,3 +128,4 @@ + ################################## +-slamch.o: slamch.c ; $(CC) -c $(NOOPTS) $(CDEFS) $< +-dlamch.o: dlamch.c ; $(CC) -c $(NOOPTS) $(CDEFS) $< +-superlu_timer.o: superlu_timer.c ; $(CC) -c $(NOOPTS) $< ++slamch.o: slamch.c ; $(CC) -fpic -c $(NOOPTS) $(CDEFS) $< ++dlamch.o: dlamch.c ; $(CC) -fpic -c $(NOOPTS) $(CDEFS) $< ++superlu_timer.o: superlu_timer.c ; $(CC) -fpic -c $(NOOPTS) $< + ################################## + + .c.o: + $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE) clean: - rm -f *.o ../libsuperlu_3.0.a -+ rm -f *.o ../libsuperlu_3.0.so +- rm -f *.o ../libsuperlu_3.0.a ++ rm -f *.o ../libsuperlu_3.0.a ../libsuperlu_3.0.so diff --git a/math/superlu/files/patch-make.inc b/math/superlu/files/patch-make.inc index 18ab9f7ccda6..6bc2cb47a062 100644 --- a/math/superlu/files/patch-make.inc +++ b/math/superlu/files/patch-make.inc @@ -1,6 +1,6 @@ --- make.inc.orig 2006-01-02 00:52:00.000000000 +0100 -+++ make.inc 2012-03-13 14:59:15.000000000 +0100 -@@ -19,22 +19,23 @@ ++++ make.inc 2012-04-11 09:50:17.000000000 +0200 +@@ -19,22 +19,25 @@ # TMGLIB = libtmglib.a SUPERLULIB = libsuperlu_3.0.a @@ -23,12 +23,20 @@ -FFLAGS = -O -LOADER = cc -LOADOPTS = -xO3 -+CC ?= gcc46 -+CFLAGS ?= -O2 -pipe -O2 -fno-strict-aliasing -pipe -O3 -pipe -fno-strict-aliasing -march=native -Wl,-rpath=/usr/local/lib/gcc46 -+FORTRAN ?= gfortran46 -+FFLAGS ?= -O -Wl,-rpath=/usr/local/lib/gcc46 -+LOADER ?= gfortran46 -+LOADOPTS = ++#CC ?= gcc46 ++#CFLAGS ?= -O3 -pipe -fno-strict-aliasing -march=native -Wl,-rpath=/usr/local/lib/gcc46 ++#FORTRAN ?= gfortran46 ++#FFLAGS ?= -O -Wl,-rpath=/usr/local/lib/gcc46 ++#LOADER ?= gfortran46 ++#LOADOPTS = ++ ++CFLAGS += -Wall -fpic # # C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase) +@@ -43,4 +46,4 @@ + # + # The directory in which Matlab is installed + # +-MATLAB = /usr/sww/pkg/matlab ++#MATLAB = /usr/sww/pkg/matlab diff --git a/math/superlu/pkg-plist b/math/superlu/pkg-plist index 927770fdc711..fd5252ca41dd 100644 --- a/math/superlu/pkg-plist +++ b/math/superlu/pkg-plist @@ -12,6 +12,7 @@ include/superlu/supermatrix.h lib/libsuperlu.a lib/libsuperlu.so lib/libsuperlu.so.4 +lib/libsuperlu_3.0.so @dirrm include/superlu %%PORTDOCS%%%%DOCSDIR%%/SLU_general.ps.gz %%PORTDOCS%%%%DOCSDIR%%/simax95.ps.gz |