deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lua: refactor root path tuning

Browse source 
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>
This commit is contained in:
Francois Perrad 2012-07-17 10:18:28 +02:00 committed by Thomas Petazzoni
parent 2c7e9c50e9
commit 641f5dcb76
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
package/lua/lua-01-root-path.patch
View file

@ -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

2
package/lua/lua.mk
View file

@ -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)" \