--- a/components/lua/Makefile Thu Oct 18 12:22:14 2012 -0700
+++ b/components/lua/Makefile Fri Oct 19 12:06:10 2012 -0700
@@ -51,7 +51,7 @@
CFLAGS += $(CC_PIC) $(CPP_LARGEFILES)
COMPONENT_BUILD_ARGS += CC="$(CC)"
-COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
+COMPONENT_BUILD_ARGS += USRCFLAGS="$(CFLAGS)"
COMPONENT_INSTALL_ARGS += INSTALL=$(INSTALL)
COMPONENT_INSTALL_ARGS += INSTALL_TOP=$(PROTOUSRDIR)
$(INSTALL_64): COMPONENT_INSTALL_ARGS += INSTALL_LIB=$(PROTOUSRLIBDIR64)
--- a/components/lua/patches/3.headers.patch Thu Oct 18 12:22:14 2012 -0700
+++ b/components/lua/patches/3.headers.patch Fri Oct 19 12:06:10 2012 -0700
@@ -1,5 +1,5 @@
---- src/lua.h.orig 2009-01-06 02:15:11.179130113 -0800
-+++ src/lua.h 2009-01-06 02:15:56.570695998 -0800
+--- src/lua.h.~1~ Fri Apr 20 06:18:26 2012
++++ src/lua.h Tue Oct 16 16:37:24 2012
@@ -9,6 +9,10 @@
#ifndef lua_h
#define lua_h
@@ -11,7 +11,7 @@
#include <stdarg.h>
#include <stddef.h>
-@@ -384,5 +388,8 @@
+@@ -435,5 +439,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************/
@@ -20,8 +20,9 @@
+#endif
#endif
---- src/lualib.h.orig 2009-01-06 02:15:19.193417835 -0800
-+++ src/lualib.h 2009-01-06 02:16:20.502288036 -0800
+
+--- src/lualib.h.~1~ Thu Dec 8 04:11:37 2011
++++ src/lualib.h Tue Oct 16 16:34:40 2012
@@ -8,6 +8,10 @@
#ifndef lualib_h
#define lualib_h
@@ -33,7 +34,7 @@
#include "lua.h"
-@@ -49,5 +53,8 @@
+@@ -51,5 +55,8 @@
#define lua_assert(x) ((void)0)
#endif
@@ -42,8 +43,8 @@
+#endif
#endif
---- src/lauxlib.h.orig 2009-01-06 02:15:37.967244620 -0800
-+++ src/lauxlib.h 2009-01-06 02:16:26.398180986 -0800
+--- src/lauxlib.h.~1~ Tue Nov 29 07:55:08 2011
++++ src/lauxlib.h Tue Oct 16 16:34:40 2012
@@ -8,6 +8,9 @@
#ifndef lauxlib_h
#define lauxlib_h
@@ -54,14 +55,14 @@
#include <stddef.h>
#include <stdio.h>
-@@ -169,6 +172,10 @@
+@@ -206,7 +209,9 @@
- #define luaL_reg luaL_Reg
+ #endif
+-
+#ifdef __cplusplus
+}
-+#endif
-+
#endif
-
++#endif
+
--- a/components/lua/patches/4.src.Makefile.patch Thu Oct 18 12:22:14 2012 -0700
+++ b/components/lua/patches/4.src.Makefile.patch Fri Oct 19 12:06:10 2012 -0700
@@ -9,7 +9,7 @@
-CC= gcc
-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+
-+CFLAGS= $(MYCFLAGS)
++CFLAGS= $(MYCFLAGS) $(USRCFLAGS)
+studio_XBITS.sparc.64 += -xcode=pic13
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
@@ -80,7 +80,7 @@
solaris:
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl"
-+ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
++ $(MAKE) all "USRCFLAGS=$(USRCFLAGS)" MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
# list targets that do not create files (but not all makes understand .PHONY)
.PHONY: all $(PLATS) default o a clean depend echo none