Tue Jan 25 12:45:43 2011 UTC ()
Pass LDFLAGS for linking


(adam)
diff -r1.32 -r1.33 pkgsrc/math/lapack/Makefile
diff -r1.13 -r1.14 pkgsrc/math/lapack/distinfo
diff -r1.6 -r1.7 pkgsrc/math/lapack/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/math/lapack/patches/patch-ac
cvs diff -r1.32 -r1.33 pkgsrc/math/lapack/Makefile (expand / switch to unified diff)

--- pkgsrc/math/lapack/Makefile 2010/07/30 10:36:29 1.32
+++ pkgsrc/math/lapack/Makefile 2011/01/25 12:45:43 1.33
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.32 2010/07/30 10:36:29 asau Exp $ 1# $NetBSD: Makefile,v 1.33 2011/01/25 12:45:43 adam Exp $
2 2
3DISTNAME= lapack-lite-3.1.1 3DISTNAME= lapack-lite-3.1.1
4PKGNAME= lapack-3.1.1 4PKGNAME= lapack-3.1.1
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/} 7MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://www.netlib.org/lapack/index.html 11HOMEPAGE= http://www.netlib.org/lapack/index.html
12COMMENT= Linear Algebra PACKage 12COMMENT= Linear Algebra PACKage
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18USE_LANGUAGES= c fortran77 18USE_LANGUAGES= c fortran77
19USE_LIBTOOL= YES 19USE_LIBTOOL= YES
20BUILD_TARGET= lapacklib 20BUILD_TARGET= lapacklib
21 21
22INSTALLATION_DIRS= lib 22INSTALLATION_DIRS= lib
23 23
24FFLAGS+= -ffloat-store 24FFLAGS+= -ffloat-store
25 25
26# With f2c-20090411nb4, libf2c-20090201nb3, we need EXT_ETIME but gcc44-4.4.1nb3 26# With f2c-20090411nb4, libf2c-20090201nb3, we need EXT_ETIME but gcc44-4.4.1nb3
27# needs INT_ETIME. Rather than trying to enumerate all possible fortran compilers, 27# needs INT_ETIME. Rather than trying to enumerate all possible fortran
28# just do a test for it. 28# compilers, just do a test for it.
29do-configure: 29do-configure:
30 @${ECHO_N} "Checking if your fortran compiler has etime() as an intrinsic... " 30 @${ECHO_N} "Checking if your fortran compiler has etime() as an intrinsic... "
31 @cd ${WRKDIR} && ${FC} -o etime_test ${FILESDIR}/etime_test.f >${WRKDIR}/etime_test.log 2>&1; \ 31 ${FC} -o ${WRKDIR}/etime_test ${FILESDIR}/etime_test.f >${WRKDIR}/etime_test.log 2>&1; \
32 if test $$? -eq 0 ; then \ 32 if ${TEST} $$? -eq 0 ; then \
33 ${ECHO} "TIMER=INT_ETIME" >> ${WRKSRC}/make.inc ; echo "YES" ; else \ 33 ${ECHO} "TIMER=INT_ETIME" >> ${WRKSRC}/make.inc ; ${ECHO} "YES" ; else \
34 ${ECHO} "TIMER=EXT_ETIME" >> ${WRKSRC}/make.inc ; echo "NO" ; fi 34 ${ECHO} "TIMER=EXT_ETIME" >> ${WRKSRC}/make.inc ; ${ECHO} "NO" ; fi
35 @${ECHO} "See ${WRKDIR}/etime_test.log for details on the test" 35 @${ECHO} "See ${WRKDIR}/etime_test.log for details on the test"
36 36
37do-install: 37do-install:
38 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/liblapack.la \ 38 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/liblapack.la \
39 ${DESTDIR}${PREFIX}/lib 39 ${DESTDIR}${PREFIX}/lib
40 40
41.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/math/lapack/distinfo (expand / switch to unified diff)

--- pkgsrc/math/lapack/distinfo 2010/03/17 21:47:11 1.13
+++ pkgsrc/math/lapack/distinfo 2011/01/25 12:45:43 1.14
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.13 2010/03/17 21:47:11 dmcmahill Exp $ 1$NetBSD: distinfo,v 1.14 2011/01/25 12:45:43 adam Exp $
2 2
3SHA1 (lapack-lite-3.1.1.tgz) = 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5 3SHA1 (lapack-lite-3.1.1.tgz) = 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5
4RMD160 (lapack-lite-3.1.1.tgz) = d81baafd1f0f9859d9f75ac9b658f743544b5f5b 4RMD160 (lapack-lite-3.1.1.tgz) = d81baafd1f0f9859d9f75ac9b658f743544b5f5b
5Size (lapack-lite-3.1.1.tgz) = 5332509 bytes 5Size (lapack-lite-3.1.1.tgz) = 5332509 bytes
6SHA1 (patch-aa) = 75671f2cc3233241f03ecab5a5d79cb505eece15 6SHA1 (patch-aa) = 432ebe3ed9ca5d0d5df675492b96c55f20179b78
7SHA1 (patch-ab) = fd5989eaafc622f29284759f538ccc0f11dfe624 7SHA1 (patch-ab) = fd5989eaafc622f29284759f538ccc0f11dfe624
8SHA1 (patch-ac) = 594736353b377c72bd41969e2ef62ef1871ae2ca 8SHA1 (patch-ac) = 1816489ac043821271d0ffcbc6f2854a3b5a736f
9SHA1 (patch-ad) = eb9cdf3d47cef03e2c679b0eda8d8120c572a2c0 9SHA1 (patch-ad) = eb9cdf3d47cef03e2c679b0eda8d8120c572a2c0
cvs diff -r1.6 -r1.7 pkgsrc/math/lapack/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/math/lapack/patches/Attic/patch-aa 2008/08/12 21:32:04 1.6
+++ pkgsrc/math/lapack/patches/Attic/patch-aa 2011/01/25 12:45:43 1.7
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-aa,v 1.6 2008/08/12 21:32:04 markd Exp $ 1$NetBSD: patch-aa,v 1.7 2011/01/25 12:45:43 adam Exp $
2 2
3--- SRC/Makefile.orig 2007-02-26 19:20:07.000000000 +0100 3--- SRC/Makefile.orig 2007-02-26 19:20:07.000000000 +0100
4+++ SRC/Makefile 4+++ SRC/Makefile
5@@ -294,8 +294,8 @@ ALLOBJ=$(SLASRC) $(DLASRC) $(CLASRC) $(Z 5@@ -294,8 +294,8 @@ ALLOBJ=$(SLASRC) $(DLASRC) $(CLASRC) $(Z
6 $(ALLAUX) 6 $(ALLAUX)
7  7
8 ../$(LAPACKLIB): $(ALLOBJ) 8 ../$(LAPACKLIB): $(ALLOBJ)
9- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) 9- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
10- $(RANLIB) $@ 10- $(RANLIB) $@
11+ ${LIBTOOL} --mode=link --tag=F77 ${FC} -o ../$(LAPACKLIB) \ 11+ ${LIBTOOL} --mode=link --tag=F77 ${FC} ${LDFLAGS} -o ../$(LAPACKLIB) \
12+ $(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 3:0 12+ $(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 3:0
13  13
14 single: $(SLASRC) $(ALLAUX) $(SCLAUX)  14 single: $(SLASRC) $(ALLAUX) $(SCLAUX)
15 $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \ 15 $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
16@@ -332,8 +332,6 @@ clean: 16@@ -332,8 +332,6 @@ clean:
17 rm -f *.o 17 rm -f *.o
18  18
19 .f.o:  19 .f.o:
20- $(FORTRAN) $(OPTS) -c $< -o $@ 20- $(FORTRAN) $(OPTS) -c $< -o $@
21+ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $< 21+ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $<
22  22
23-slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ 23-slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
24-dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ 24-dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
cvs diff -r1.2 -r1.3 pkgsrc/math/lapack/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/math/lapack/patches/Attic/patch-ac 2010/03/17 21:47:11 1.2
+++ pkgsrc/math/lapack/patches/Attic/patch-ac 2011/01/25 12:45:43 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.2 2010/03/17 21:47:11 dmcmahill Exp $ 1$NetBSD: patch-ac,v 1.3 2011/01/25 12:45:43 adam Exp $
2 2
3--- /dev/null 2007-11-22 18:29:57.000000000 +0100 3--- /dev/null 2007-11-22 18:29:57.000000000 +0100
4+++ make.inc 4+++ make.inc
5@@ -0,0 +1,9 @@ 5@@ -0,0 +1,9 @@
6+SHELL= /bin/sh 6+SHELL= /bin/sh
7+PLAT= _${MACHINE} 7+PLAT= _${MACHINE}
8+FORTRAN= ${FC} 8+FORTRAN= ${FC}
9+OPTS= ${FFLAGS} 9+OPTS= ${FFLAGS}
10+DRVOPTS= $(OPTS) 10+DRVOPTS= $(OPTS)
11+NOOPT= 11+NOOPT=
12+LOADER= ${FC} 12+LOADER= ${FC}
13+LOADOPTS= 13+LOADOPTS= ${LDFLAGS}
14+LAPACKLIB= liblapack.la 14+LAPACKLIB= liblapack.la