mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
lua: refactor with a common template lua.pc.in
lua.pc is generated from a common template in the build step. install steps are restored like in BR 2017.05 Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
08aa81768e
commit
a4b8299df3
@ -1,42 +0,0 @@
|
|||||||
add lua.pc
|
|
||||||
|
|
||||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
|
||||||
[Jörg Krause: add @MYLIBS@]
|
|
||||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
||||||
|
|
||||||
Index: b/etc/lua.pc
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/etc/lua.pc
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+# lua.pc -- pkg-config data for Lua
|
|
||||||
+
|
|
||||||
+# vars from install Makefile
|
|
||||||
+
|
|
||||||
+# grep '^V=' ../Makefile
|
|
||||||
+V= 5.2
|
|
||||||
+# grep '^R=' ../Makefile
|
|
||||||
+R= 5.2.3
|
|
||||||
+
|
|
||||||
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
|
|
||||||
+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}
|
|
||||||
+
|
|
||||||
+# canonical vars
|
|
||||||
+exec_prefix=${prefix}
|
|
||||||
+libdir=${exec_prefix}/lib
|
|
||||||
+includedir=${prefix}/include
|
|
||||||
+
|
|
||||||
+Name: Lua
|
|
||||||
+Description: An Extensible Extension Language
|
|
||||||
+Version: ${R}
|
|
||||||
+Requires:
|
|
||||||
+Libs: -L${libdir} -llua -lm @MYLIBS@
|
|
||||||
+Cflags: -I${includedir}
|
|
||||||
+
|
|
||||||
+# (end of lua.pc)
|
|
@ -1,42 +0,0 @@
|
|||||||
add lua.pc
|
|
||||||
|
|
||||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
|
||||||
[Jörg Krause: add @MYLIBS@]
|
|
||||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
||||||
|
|
||||||
Index: b/etc/lua.pc
|
|
||||||
===================================================================
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/etc/lua.pc
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+# lua.pc -- pkg-config data for Lua
|
|
||||||
+
|
|
||||||
+# vars from install Makefile
|
|
||||||
+
|
|
||||||
+# grep '^V=' ../Makefile
|
|
||||||
+V= 5.3
|
|
||||||
+# grep '^R=' ../Makefile
|
|
||||||
+R= 5.3.4
|
|
||||||
+
|
|
||||||
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
|
|
||||||
+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}
|
|
||||||
+
|
|
||||||
+# canonical vars
|
|
||||||
+exec_prefix=${prefix}
|
|
||||||
+libdir=${exec_prefix}/lib
|
|
||||||
+includedir=${prefix}/include
|
|
||||||
+
|
|
||||||
+Name: Lua
|
|
||||||
+Description: An Extensible Extension Language
|
|
||||||
+Version: ${R}
|
|
||||||
+Requires:
|
|
||||||
+Libs: -L${libdir} -llua -lm @MYLIBS@
|
|
||||||
+Cflags: -I${includedir}
|
|
||||||
+
|
|
||||||
+# (end of lua.pc)
|
|
@ -73,6 +73,8 @@ define LUA_BUILD_CMDS
|
|||||||
MYLDFLAGS="$(TARGET_LDFLAGS)" \
|
MYLDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
BUILDMODE=$(LUA_BUILDMODE) \
|
BUILDMODE=$(LUA_BUILDMODE) \
|
||||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||||
|
sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(LUA_MYLIBS)/" \
|
||||||
|
package/lua/lua.pc.in > $(@D)/lua.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define HOST_LUA_BUILD_CMDS
|
define HOST_LUA_BUILD_CMDS
|
||||||
@ -82,13 +84,14 @@ define HOST_LUA_BUILD_CMDS
|
|||||||
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
||||||
BUILDMODE=static \
|
BUILDMODE=static \
|
||||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||||
|
sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \
|
||||||
|
package/lua/lua.pc.in > $(@D)/lua.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define LUA_INSTALL_STAGING_CMDS
|
define LUA_INSTALL_STAGING_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
||||||
mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
|
$(INSTALL) -m 0644 -D $(@D)/lua.pc \
|
||||||
sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
|
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
||||||
> $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define LUA_INSTALL_TARGET_CMDS
|
define LUA_INSTALL_TARGET_CMDS
|
||||||
@ -97,9 +100,8 @@ endef
|
|||||||
|
|
||||||
define HOST_LUA_INSTALL_CMDS
|
define HOST_LUA_INSTALL_CMDS
|
||||||
$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)" -C $(@D) install
|
$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)" -C $(@D) install
|
||||||
mkdir -p $(HOST_DIR)/lib/pkgconfig/
|
$(INSTALL) -m 0644 -D $(@D)/lua.pc \
|
||||||
sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
|
$(HOST_DIR)/lib/pkgconfig/lua.pc
|
||||||
> $(HOST_DIR)/lib/pkgconfig/lua.pc
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(generic-package))
|
$(eval $(generic-package))
|
||||||
|
26
package/lua/lua.pc.in
Normal file
26
package/lua/lua.pc.in
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
# lua.pc -- pkg-config data for Lua
|
||||||
|
|
||||||
|
V= @ABI@
|
||||||
|
R= @VERSION@
|
||||||
|
|
||||||
|
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}
|
||||||
|
|
||||||
|
# canonical vars
|
||||||
|
exec_prefix=${prefix}
|
||||||
|
libdir=${exec_prefix}/lib
|
||||||
|
includedir=${prefix}/include
|
||||||
|
|
||||||
|
Name: Lua
|
||||||
|
Description: An Extensible Extension Language
|
||||||
|
Version: ${R}
|
||||||
|
Requires:
|
||||||
|
Libs: -L${libdir} -llua -lm @MYLIBS@
|
||||||
|
Cflags: -I${includedir}
|
||||||
|
|
||||||
|
# (end of lua.pc)
|
Loading…
x
Reference in New Issue
Block a user