[89921] trunk/dports/devel/luarocks

and.damore at macports.org and.damore at macports.org
Wed Feb 15 09:06:23 PST 2012


Revision: 89921
          http://trac.macports.org/changeset/89921
Author:   and.damore at macports.org
Date:     2012-02-15 09:06:19 -0800 (Wed, 15 Feb 2012)
Log Message:
-----------
port luarocks: fixes dependency check in rocks, now luarocks correctly finds macports provided libraries; revision bumped to force rebuild

Modified Paths:
--------------
    trunk/dports/devel/luarocks/Portfile
    trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff

Modified: trunk/dports/devel/luarocks/Portfile
===================================================================
--- trunk/dports/devel/luarocks/Portfile	2012-02-15 16:01:51 UTC (rev 89920)
+++ trunk/dports/devel/luarocks/Portfile	2012-02-15 17:06:19 UTC (rev 89921)
@@ -2,6 +2,7 @@
 PortSystem          1.0
 name                luarocks
 version             2.0.7.1
+revision            1
 categories          devel
 platforms           darwin
 maintainers         and.damore openmaintainer
@@ -26,6 +27,10 @@
                     --rocks-tree=${prefix}/share/${name}
 
 patchfiles          patch-src_luarocks_cfg.lua.diff
+post-patch {
+    reinplace   "s|%PREFIX%|${prefix}|g"             ${worksrcpath}/src/luarocks/cfg.lua
+    reinplace "s|%COMPILER%|${configure.compiler}|g" ${worksrcpath}/src/luarocks/cfg.lua
+}
 
 use_parallel_build  no
 

Modified: trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff
===================================================================
--- trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff	2012-02-15 16:01:51 UTC (rev 89920)
+++ trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff	2012-02-15 17:06:19 UTC (rev 89921)
@@ -1,5 +1,5 @@
---- src/luarocks/cfg.lua.orig	2012-01-10 22:31:18.000000000 -0600
-+++ src/luarocks/cfg.lua	2012-01-14 22:38:30.000000000 -0600
+--- src/luarocks/cfg.lua.orig	2012-02-15 14:48:44.000000000 +0100
++++ src/luarocks/cfg.lua	2012-02-15 14:53:14.000000000 +0100
 @@ -141,8 +141,8 @@
     use_extensions = false,
     accept_unknown_fields = false,
@@ -11,3 +11,29 @@
  
     arch = "unknown",
     lib_extension = "unknown",
+@@ -290,10 +290,10 @@
+    defaults.lib_extension = "so"
+    defaults.external_lib_extension = "so"
+    defaults.obj_extension = "o"
+-   defaults.external_deps_dirs = { "/usr/local", "/usr" }
+-   defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin"
+-   defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include"
+-   defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib"
++   defaults.external_deps_dirs = { "%PREFIX%", "/usr/local", "/usr" }
++   defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "%PREFIX%/bin"
++   defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "%PREFIX%/include"
++   defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "%PREFIX%/lib"
+    defaults.variables.CFLAGS = "-O2"
+    defaults.cmake_generator = "Unix Makefiles"
+    defaults.platforms = { "unix" }
+@@ -330,8 +330,8 @@
+    defaults.external_lib_extension = "dylib"
+    defaults.arch = "macosx-"..proc
+    defaults.platforms = {"unix", "bsd", "macosx"}
+-   defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10.3; gcc"
+-   defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10.3; gcc"
++   defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10.5; %COMPILER%"
++   defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10.5; %COMPILER%"
+    defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
+ end
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120215/b3b6ba3c/attachment-0001.html>


More information about the macports-changes mailing list