[luajit/f19] fix lua extensions on x86_64
Igor Gnatenko
ignatenkobrain at fedoraproject.org
Mon Dec 16 20:37:14 UTC 2013
commit b6019ec6ac42f6e3d56676df770b1e3bab7636a5
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Tue Dec 17 00:36:50 2013 +0400
fix lua extensions on x86_64
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
luajit-path64.patch | 17 +++++++++++++++++
luajit.spec | 10 +++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/luajit-path64.patch b/luajit-path64.patch
new file mode 100644
index 0000000..64bc3b2
--- /dev/null
+++ b/luajit-path64.patch
@@ -0,0 +1,17 @@
+--- LuaJIT-2.0.2/src/luaconf.h.orig 2013-12-15 23:38:21.729467102 +0000
++++ LuaJIT-2.0.2/src/luaconf.h 2013-12-15 23:38:41.057542902 +0000
+@@ -28,12 +28,12 @@
+ */
+ #define LUA_ROOT "/usr/local/"
+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+-#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
++#define LUA_CDIR LUA_ROOT "lib64/lua/5.1/"
+ #ifdef LUA_XROOT
+ #define LUA_JDIR LUA_XROOT "share/luajit-2.0.2/"
+ #define LUA_XPATH \
+ ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
+-#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
++#define LUA_XCPATH LUA_XROOT "lib64/lua/5.1/?.so;"
+ #else
+ #define LUA_JDIR LUA_ROOT "share/luajit-2.0.2/"
+ #define LUA_XPATH
diff --git a/luajit.spec b/luajit.spec
index dfe55a4..f6a4a01 100644
--- a/luajit.spec
+++ b/luajit.spec
@@ -1,10 +1,11 @@
Name: luajit
Version: 2.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Just-In-Time Compiler for Lua
License: MIT
URL: http://luajit.org/
Source0: http://luajit.org/download/LuaJIT-%{version}.tar.gz
+Patch0: luajit-path64.patch
%description
LuaJIT implements the full set of language features defined by Lua 5.1.
@@ -32,6 +33,10 @@ sed -i -e 's!${.*prefix}/lib!%{_libdir}!g' etc/luajit.pc
# preserve timestamps (cicku)
sed -i -e '/install -m/s/-m/-p -m/' Makefile
+%ifarch x86_64
+%patch0 -p1 -b .path64
+%endif
+
%build
%configure
# Q= - enable verbose output
@@ -72,6 +77,9 @@ find %{buildroot} -type f -name *.a -delete
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sun Dec 15 2013 Clive Messer <clive.messer at communitysqueeze.org> - 2.0.2-9
+- Apply luajit-path64.patch on x86_64.
+
* Mon Dec 09 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 2.0.2-8
- Fix strip (thanks Ville Skyttä)
More information about the scm-commits
mailing list