From b54e5f1cd6c00d93ba28e5d38dbb5de8e26139cf Mon Sep 17 00:00:00 2001 From: dholland Date: Fri, 28 May 2010 05:35:50 +0000 Subject: [PATCH] Apply Solaris build fix from Joern Clausen in PR 43350. --- lang/lua/distinfo | 4 ++-- lang/lua/patches/patch-ac | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lang/lua/distinfo b/lang/lua/distinfo index fac9e5c553c2..1ea8b049538d 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.25 2009/12/17 16:42:45 jmmv Exp $ +$NetBSD: distinfo,v 1.26 2010/05/28 05:35:50 dholland Exp $ SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7 RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef Size (lua-5.1.4.tar.gz) = 216679 bytes SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db SHA1 (patch-ab) = c5d35cbef2be7c3e2d41209c6656beacc0aa0415 -SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de +SHA1 (patch-ac) = a7cd4d0cce86b511481a6ef681aec64d97e3414e diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac index 870e0581f9b6..b95c6984cad4 100644 --- a/lang/lua/patches/patch-ac +++ b/lang/lua/patches/patch-ac @@ -1,6 +1,9 @@ -$NetBSD: patch-ac,v 1.7 2007/07/02 13:36:39 joerg Exp $ +$NetBSD: patch-ac,v 1.8 2010/05/28 05:35:50 dholland Exp $ ---- src/luaconf.h.orig 2007-03-24 04:01:55.000000000 +0100 +- 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 @@ -94,7 +94,9 @@ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" @@ -12,3 +15,12 @@ $NetBSD: patch-ac,v 1.7 2007/07/02 13:36:39 joerg Exp $ #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #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__) + #define LUAI_FUNC __attribute__((visibility("hidden"))) extern + #define LUAI_DATA LUAI_FUNC +