sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling of shared lib.

Browse source 
PR:	166703
Submitted by:	Oliver Hartmann <ohartman@zedat.fu-berlin.de>
This commit is contained in:
Maho Nakata 2012-04-25 07:09:18 +00:00
parent 96ecc60ece
commit 2d9be844d8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295453
4 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
math/superlu/Makefile
View file

@ -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

27
math/superlu/files/patch-SRC-Makefile
View file

@ -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

24
math/superlu/files/patch-make.inc
View file

@ -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

1
math/superlu/pkg-plist
View file

@ -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