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>
This commit is contained in:
parent
2c7e9c50e9
commit
641f5dcb76
@ -1,5 +1,29 @@
|
|||||||
Adjust installation location to /usr.
|
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
|
Index: b/src/luaconf.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- a/src/luaconf.h
|
--- a/src/luaconf.h
|
||||||
|
@ -28,7 +28,6 @@ HOST_LUA_MYLIBS = -ldl
|
|||||||
|
|
||||||
define LUA_BUILD_CMDS
|
define LUA_BUILD_CMDS
|
||||||
sed -i -e 's/-O2//' $(@D)/src/Makefile
|
sed -i -e 's/-O2//' $(@D)/src/Makefile
|
||||||
sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
|
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
|
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
|
||||||
MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
|
MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
|
||||||
@ -38,7 +37,6 @@ endef
|
|||||||
|
|
||||||
define HOST_LUA_BUILD_CMDS
|
define HOST_LUA_BUILD_CMDS
|
||||||
sed -i -e 's/-O2//' $(@D)/src/Makefile
|
sed -i -e 's/-O2//' $(@D)/src/Makefile
|
||||||
sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
|
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
|
MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
|
||||||
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
||||||
|
Loading…
Reference in New Issue
Block a user