summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2012-07-17 08:18:28 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-07-17 19:19:36 (GMT)
commit641f5dcb764f63c086a23a2018aca952e83ef666 (patch)
treeb12572a5bf1aaf9d130a746986247256dd493df9
parent2c7e9c50e9bef1c494ef90411a466ad320846b96 (diff)
downloadbuildroot-641f5dcb764f63c086a23a2018aca952e83ef666.tar.gz
buildroot-641f5dcb764f63c086a23a2018aca952e83ef666.tar.bz2
lua: refactor root path tuning
Use a patch rather than sed'ing files in the build process. Signed-off-by: Francois Perrad <fperrad@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/lua/lua-01-root-path.patch24
-rw-r--r--package/lua/lua.mk2
2 files changed, 24 insertions, 2 deletions
diff --git a/package/lua/lua-01-root-path.patch b/package/lua/lua-01-root-path.patch
index c5dbf32..f82c9c5 100644
--- a/package/lua/lua-01-root-path.patch
+++ b/package/lua/lua-01-root-path.patch
@@ -1,5 +1,29 @@
Adjust installation location to /usr.
+Remove version in module paths.
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/etc/lua.pc
+===================================================================
+--- a/etc/lua.pc
++++ b/etc/lua.pc
+@@ -8,13 +8,13 @@
+ R= 5.1.5
+
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+ INSTALL_MAN= ${prefix}/man/man1
+-INSTALL_LMOD= ${prefix}/share/lua/${V}
+-INSTALL_CMOD= ${prefix}/lib/lua/${V}
++INSTALL_LMOD= ${prefix}/share/lua
++INSTALL_CMOD= ${prefix}/lib/lua
+
+ # canonical vars
+ exec_prefix=${prefix}
Index: b/src/luaconf.h
===================================================================
--- a/src/luaconf.h
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index b61d6f1..1e52075 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -28,7 +28,6 @@ HOST_LUA_MYLIBS = -ldl
define LUA_BUILD_CMDS
sed -i -e 's/-O2//' $(@D)/src/Makefile
- sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
$(MAKE) \
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
@@ -38,7 +37,6 @@ endef
define HOST_LUA_BUILD_CMDS
sed -i -e 's/-O2//' $(@D)/src/Makefile
- sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
$(MAKE) \
MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
MYLIBS="$(HOST_LUA_MYLIBS)" \