[22822] trunk/dports/devel/lua-numlua

Thu Mar 15 22:32:24 PDT 2007

Revision: 22822
          http://trac.macosforge.org/projects/macports/changeset/22822
Author:   bfulgham at macports.org
Date:     2007-03-15 22:32:24 -0700 (Thu, 15 Mar 2007)

Log Message:
-----------
Update to use Accellerate framework.

Modified Paths:
--------------
    trunk/dports/devel/lua-numlua/Portfile
    trunk/dports/devel/lua-numlua/files/patch-lib-config
    trunk/dports/devel/lua-numlua/files/patch-src-Makefile

Added Paths:
-----------
    trunk/dports/devel/lua-numlua/files/patch-lib-Makefile

Modified: trunk/dports/devel/lua-numlua/Portfile
===================================================================

--- trunk/dports/devel/lua-numlua/Portfile	2007-03-16 03:27:57 UTC (rev 22821)
+++ trunk/dports/devel/lua-numlua/Portfile	2007-03-16 05:32:24 UTC (rev 22822)
@@ -29,10 +29,11 @@
 
 patchfiles              patch-Makefile \
                         patch-lib-config \
+			patch-lib-Makefile \
 			patch-src-Makefile
 
 build.type		gnu
-build.cmd		cd lib && make && cd ../src && make
+build.cmd		cd lib && make && cd ../src && make && cd ..
 build.args		
 build.target		
 
@@ -50,7 +51,6 @@
         depends_build-append port:gcc42
 
         post-patch {
-                reinplace "s:gfortran-dp-4.1:gfortran-dp-4.2:g" ${worksrcpath}/numpy/distutils/fcompiler/gnu.py
 		reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Makefile
 		reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/lib/config
 		reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/src/Makefile

Added: trunk/dports/devel/lua-numlua/files/patch-lib-Makefile
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-Makefile	                        (rev 0)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-Makefile	2007-03-16 05:32:24 UTC (rev 22822)
@@ -0,0 +1,12 @@
+--- lib/Makefile.orig	2007-03-14 21:33:57.000000000 -0700
++++ lib/Makefile	2007-03-14 21:47:19.000000000 -0700
+@@ -1,7 +1,8 @@
+ # Top makefile for netlib libs
+ # $Id :$
+ 
+-LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
++#LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
++LIBS = libdcdflib.a libfnlib.a libranlib.a
+ NOLAPACK = libdcdflib.a libfnlib.a libranlib.a libblas.a
+ NOBLAS = libdcdflib.a libfnlib.a libranlib.a
+ MAKE = make

Modified: trunk/dports/devel/lua-numlua/files/patch-lib-config
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-config	2007-03-16 03:27:57 UTC (rev 22821)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-config	2007-03-16 05:32:24 UTC (rev 22822)
@@ -1,6 +1,6 @@
---- lib/config.orig	2006-02-17 18:11:35.000000000 -0800
-+++ lib/config	2006-11-12 15:27:51.000000000 -0800
-@@ -3,10 +3,10 @@
+--- lib/config.orig	2007-03-14 21:33:25.000000000 -0700
++++ lib/config	2007-03-15 22:24:56.000000000 -0700
+@@ -3,14 +3,14 @@
  
  # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
  # main Makefile
@@ -13,3 +13,8 @@
  FFLAGS = -fno-f2c -funroll-all-loops -fomit-frame-pointer -O
  
  # C flags (used by ranlib)
+-CC = gcc
++CC = gcc-dp-4.1
+ CFLAGS = -W -Wall -pedantic
+ OPTFLAGS = -fomit-frame-pointer -O2
+ INCFLAGS = -I../../src -I$(LUADIR)/include

Modified: trunk/dports/devel/lua-numlua/files/patch-src-Makefile
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-src-Makefile	2007-03-16 03:27:57 UTC (rev 22821)
+++ trunk/dports/devel/lua-numlua/files/patch-src-Makefile	2007-03-16 05:32:24 UTC (rev 22822)
@@ -1,6 +1,6 @@
---- src/Makefile.orig	2006-02-17 18:11:35.000000000 -0800
-+++ src/Makefile	2006-11-12 15:59:33.000000000 -0800
-@@ -1,8 +1,8 @@
+--- src/Makefile.orig	2007-03-14 21:25:59.000000000 -0700
++++ src/Makefile	2007-03-15 21:53:59.000000000 -0700
+@@ -1,13 +1,13 @@
  # Makefile for numlua
  # $Id: Makefile,v 1.6 2006/02/18 01:54:38 carvalho Exp $
  
@@ -10,8 +10,15 @@
 +TARGET = darwin
  
  # atlas | atlas_threaded | blas | custom
- BLAS = blas
-@@ -15,10 +15,10 @@
+-BLAS = blas
++BLAS = custom
+ # if BLAS = custom, define CUSTOMBLAS below
+-CUSTOMBLAS = 
++CUSTOMBLAS = -faltivec -framework Accelerate -lm -lgfortran
+ # Kazushige Goto's BLAS
+ #CUSTOMBLAS = -llapack -lgoto_prescott-32-r0.99-3 -lpthread -lg2c
+ # Intel's MKL
+@@ -15,9 +15,9 @@
  
  # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
  # main Makefile
@@ -19,36 +26,18 @@
 +LUADIR = /opt/local
  
 -CC = gcc
--CFLAGS = -W -Wall -pedantic -fshort-enums
 +CC = MACOSX_DEPLOYMENT_TARGET="10.3" gcc-dp-4.1
-+CFLAGS = -W -Wall -pedantic -fshort-enums 
+ CFLAGS = -W -Wall -pedantic -fshort-enums
  OPTFLAGS = -fomit-frame-pointer -O2 # -g
  
- AR = ar rcu
-@@ -30,19 +30,23 @@
- 
- LIBS = -L../lib -lfnlib -ldcdflib -lranlib
- ifeq ($(BLAS), atlas)
--LIBS += -llapack -lcblas -lf77blas -latlas -lg2c
-+LIBS += -llapack -lcblas -lf77blas -latlas #-lg2c
+@@ -43,6 +43,10 @@
  endif
- ifeq ($(BLAS), atlas_threaded)
--LIBS += -llapack -lptcblas -lptf77blas -latlas -lg2c -lpthread
-+LIBS += -llapack -lptcblas -lptf77blas -latlas -lpthread #-lg2c
- endif
- ifeq ($(BLAS), blas)
--LIBS += -llapack -lblas -lg2c
-+LIBS += -llapack -lblas #-lg2c
- endif
- ifeq ($(BLAS), custom)
- LIBS += $(CUSTOMBLAS)
- endif
  ifeq ($(TARGET), win32)
  LIBS += -L$(LUADIR)/lib -llua
 +else
 +  ifeq ($(TARGET), darwin)
 +LIBS += -L$(LUADIR)/lib -llua
-+  endif  
++  endif
  endif
  
  OBJ = luaspfun.o luarng.o luacomplex.o

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070315/06d18123/attachment.html
