diff options
Diffstat (limited to 'lang/lua/patches/patch-ac')
| -rw-r--r-- | lang/lua/patches/patch-ac | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac index a453bee3095..5171a4856ed 100644 --- a/lang/lua/patches/patch-ac +++ b/lang/lua/patches/patch-ac @@ -1,26 +1,23 @@ -$NetBSD: patch-ac,v 1.9 2012/03/12 15:49:27 wiz Exp $ +$NetBSD: patch-ac,v 1.10 2013/07/04 18:04:42 adam Exp $ -- allow LUA_ROOT to be set by the pkgsrc makefile -- solaris fix for PR 43350 - ---- src/luaconf.h.orig 2008-02-11 16:25:08.000000000 +0000 +--- src/luaconf.h.orig 2013-03-16 21:10:18.000000000 +0000 +++ src/luaconf.h -@@ -94,7 +94,9 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" +@@ -100,7 +100,9 @@ + #else /* }{ */ - #else + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +#ifndef LUA_ROOT #define LUA_ROOT "/usr/local/" +#endif - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ -@@ -183,7 +185,7 @@ - #define LUAI_DATA /* empty */ - - #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ -- defined(__ELF__) -+ defined(__ELF__) && !defined(__sun) +@@ -175,7 +177,7 @@ + ** default definition. + */ + #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ +- defined(__ELF__) /* { */ ++ defined(__ELF__) && !defined(__sun) /* { */ #define LUAI_FUNC __attribute__((visibility("hidden"))) extern - #define LUAI_DATA LUAI_FUNC - + #define LUAI_DDEC LUAI_FUNC + #define LUAI_DDEF /* empty */ |