Pass LDFLAGS for linking

4 files changed, 15 insertions, 15 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 0e419ab4a01..7995f2348c6 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/07/30 10:36:29 asau Exp $
+# $NetBSD: Makefile,v 1.33 2011/01/25 12:45:43 adam Exp $
 
 DISTNAME=	lapack-lite-3.1.1
 PKGNAME=	lapack-3.1.1
@@ -24,14 +24,14 @@ INSTALLATION_DIRS=	lib
 FFLAGS+=		-ffloat-store
 
 # With f2c-20090411nb4, libf2c-20090201nb3, we need EXT_ETIME but gcc44-4.4.1nb3
-# needs INT_ETIME.  Rather than trying to enumerate all possible fortran compilers,
-# just do a test for it.
+# needs INT_ETIME.  Rather than trying to enumerate all possible fortran
+# compilers, just do a test for it.
 do-configure:
-	@${ECHO_N} "Checking if your fortran compiler  has etime() as an intrinsic... "
-	@cd ${WRKDIR} && ${FC} -o etime_test ${FILESDIR}/etime_test.f >${WRKDIR}/etime_test.log 2>&1; \
-		if test $$? -eq 0 ; then \
-		${ECHO} "TIMER=INT_ETIME" >> ${WRKSRC}/make.inc ; echo "YES" ; else \
-		${ECHO} "TIMER=EXT_ETIME" >> ${WRKSRC}/make.inc ; echo "NO" ; fi
+	@${ECHO_N} "Checking if your fortran compiler has etime() as an intrinsic... "
+	${FC} -o ${WRKDIR}/etime_test ${FILESDIR}/etime_test.f >${WRKDIR}/etime_test.log 2>&1; \
+	if ${TEST} $$? -eq 0 ; then \
+	${ECHO} "TIMER=INT_ETIME" >> ${WRKSRC}/make.inc ; ${ECHO} "YES" ; else \
+	${ECHO} "TIMER=EXT_ETIME" >> ${WRKSRC}/make.inc ; ${ECHO} "NO" ; fi
 	@${ECHO} "See ${WRKDIR}/etime_test.log for details on the test"
 
 do-install:
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 438b7dcb91c..507afb137ff 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2010/03/17 21:47:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.14 2011/01/25 12:45:43 adam Exp $
 
 SHA1 (lapack-lite-3.1.1.tgz) = 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5
 RMD160 (lapack-lite-3.1.1.tgz) = d81baafd1f0f9859d9f75ac9b658f743544b5f5b
 Size (lapack-lite-3.1.1.tgz) = 5332509 bytes
-SHA1 (patch-aa) = 75671f2cc3233241f03ecab5a5d79cb505eece15
+SHA1 (patch-aa) = 432ebe3ed9ca5d0d5df675492b96c55f20179b78
 SHA1 (patch-ab) = fd5989eaafc622f29284759f538ccc0f11dfe624
-SHA1 (patch-ac) = 594736353b377c72bd41969e2ef62ef1871ae2ca
+SHA1 (patch-ac) = 1816489ac043821271d0ffcbc6f2854a3b5a736f
 SHA1 (patch-ad) = eb9cdf3d47cef03e2c679b0eda8d8120c572a2c0
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index f7879066154..585b4624657 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2008/08/12 21:32:04 markd Exp $
+$NetBSD: patch-aa,v 1.7 2011/01/25 12:45:43 adam Exp $
 
 --- SRC/Makefile.orig	2007-02-26 19:20:07.000000000 +0100
 +++ SRC/Makefile
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.6 2008/08/12 21:32:04 markd Exp $
  ../$(LAPACKLIB): $(ALLOBJ)
 -	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
 -	$(RANLIB) $@
-+	${LIBTOOL} --mode=link --tag=F77 ${FC} -o ../$(LAPACKLIB) \
++	${LIBTOOL} --mode=link --tag=F77 ${FC} ${LDFLAGS} -o ../$(LAPACKLIB) \
 +	$(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 3:0
  
  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
diff --git a/math/lapack/patches/patch-ac b/math/lapack/patches/patch-ac
index 4fd4d00c1ed..c760841376b 100644
--- a/math/lapack/patches/patch-ac
+++ b/math/lapack/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2010/03/17 21:47:11 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.3 2011/01/25 12:45:43 adam Exp $
 
 --- /dev/null	2007-11-22 18:29:57.000000000 +0100
 +++ make.inc
@@ -10,5 +10,5 @@ $NetBSD: patch-ac,v 1.2 2010/03/17 21:47:11 dmcmahill Exp $
 +DRVOPTS=	$(OPTS)
 +NOOPT=
 +LOADER=		${FC}
-+LOADOPTS=
++LOADOPTS=	${LDFLAGS}
 +LAPACKLIB=	liblapack.la