diff options
| author | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-29 11:38:22 +0000 |
|---|---|---|
| committer | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-29 11:38:22 +0000 |
| commit | adde7768a2eab2950a7628319ec832c63a00ff03 (patch) | |
| tree | 9567ad9ae55e12463738bd2da0403849d9a0803b | |
| parent | b6fb9a7180b9b173ebf5e369fe8cd28613d6742d (diff) | |
lua: Fixed some cross-platform issues for PPC (and probably other architectures)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11608 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/lua/Makefile | 4 | ||||
| -rw-r--r-- | package/lua/patches/015-lnum-ppc-compat.patch | 13 | ||||
| -rw-r--r-- | tools/lua/patches/015-lnum-ppc-compat.patch | 13 |
3 files changed, 28 insertions, 2 deletions
diff --git a/package/lua/Makefile b/package/lua/Makefile index e5ac938c0..c7706376d 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.1.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -96,7 +96,7 @@ define Build/Compile AR="$(TARGET_CROSS)ar rcu" \ RANLIB="$(TARGET_CROSS)ranlib" \ INSTALL_ROOT=/usr \ - CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -fPIC" \ MYLDFLAGS="$(TARGET_LDFLAGS)" \ PKG_VERSION=$(PKG_VERSION) \ all linux diff --git a/package/lua/patches/015-lnum-ppc-compat.patch b/package/lua/patches/015-lnum-ppc-compat.patch new file mode 100644 index 000000000..d6c48a775 --- /dev/null +++ b/package/lua/patches/015-lnum-ppc-compat.patch @@ -0,0 +1,13 @@ +Index: lua-5.1.3/src/lua.h +=================================================================== +--- lua-5.1.3.orig/src/lua.h 2008-06-29 11:45:55.000000000 +0200 ++++ lua-5.1.3/src/lua.h 2008-06-29 11:46:28.000000000 +0200 +@@ -79,7 +79,7 @@ + * not acceptable for 5.1, maybe 5.2 onwards? + * 9: greater than existing (5.1) type values. + */ +-#define LUA_TINT (-2) ++#define LUA_TINT 9 + + #define LUA_TNIL 0 + #define LUA_TBOOLEAN 1 diff --git a/tools/lua/patches/015-lnum-ppc-compat.patch b/tools/lua/patches/015-lnum-ppc-compat.patch new file mode 100644 index 000000000..d6c48a775 --- /dev/null +++ b/tools/lua/patches/015-lnum-ppc-compat.patch @@ -0,0 +1,13 @@ +Index: lua-5.1.3/src/lua.h +=================================================================== +--- lua-5.1.3.orig/src/lua.h 2008-06-29 11:45:55.000000000 +0200 ++++ lua-5.1.3/src/lua.h 2008-06-29 11:46:28.000000000 +0200 +@@ -79,7 +79,7 @@ + * not acceptable for 5.1, maybe 5.2 onwards? + * 9: greater than existing (5.1) type values. + */ +-#define LUA_TINT (-2) ++#define LUA_TINT 9 + + #define LUA_TNIL 0 + #define LUA_TBOOLEAN 1 |