Skip to contentSkip to conversation

lua: refactor with a common template lua.pc.in

PATCH New Francois Perrad 2 participants 3 messages Aug 21, 2017 – Oct 12, 2017

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
---
 package/lua/5.2.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/5.3.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/lua.mk                  | 14 +++++++------
 package/lua/lua.pc.in               | 26 +++++++++++++++++++++++
 4 files changed, 34 insertions(+), 90 deletions(-)
 delete mode 100644 package/lua/5.2.4/0004-lua-pc.patch
 delete mode 100644 package/lua/5.3.4/0004-lua-pc.patch
 create mode 100644 package/lua/lua.pc.in
package/lua/5.2.4/0004-lua-pc.patch deleted +0 -42
deleted file mode 100644
index 31ff61157..000000000
@@ -1,42 +0,0 @@
-add lua.pc
-
-Signed-off-by: Francois Perrad <[email protected]>
-[J?rg Krause: add @MYLIBS@]
-Signed-off-by: J?rg Krause <[email protected]>
-
-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)
package/lua/5.3.4/0004-lua-pc.patch deleted +0 -42

42 lines not on this page · raw message

package/lua/lua.mk +8 -6
index ee39480dc..0ac2e0e25 100644
@@ -73,6 +73,8 @@ define LUA_BUILD_CMDS
 	MYLDFLAGS="$(TARGET_LDFLAGS)" \
 	BUILDMODE=$(LUA_BUILDMODE) \
 	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
 
 define HOST_LUA_BUILD_CMDS

@@ -82,13 +84,14 @@ define HOST_LUA_BUILD_CMDS
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
 	BUILDMODE=static \
 	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
 
 define LUA_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
-	sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
-		> $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
+	$(INSTALL) -m 0644 -D $(@D)/lua.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
 endef
 
 define LUA_INSTALL_TARGET_CMDS

@@ -97,9 +100,8 @@ endef
 
 define HOST_LUA_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)" -C $(@D) install
-	mkdir -p $(HOST_DIR)/lib/pkgconfig/
-	sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
-		> $(HOST_DIR)/lib/pkgconfig/lua.pc
+	$(INSTALL) -m 0644 -D $(@D)/lua.pc \
+		$(HOST_DIR)/lib/pkgconfig/lua.pc
 endef
 
 $(eval $(generic-package))
package/lua/lua.pc.in new file +26 -0
new file mode 100644
index 000000000..0a61d5e6d
@@ -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)
Signature · 1 line
2.11.0
#1 lore raw

PATCH v2 1/1 lua: refactor with a common template lua.pc.in

Hello,

Quoted 4 lines · Francois Perrad

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 <[email protected]>
Quoted 9 lines
---
 package/lua/5.2.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/5.3.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/lua.mk                  | 14 +++++++------
 package/lua/lua.pc.in               | 26 +++++++++++++++++++++++
 4 files changed, 34 insertions(+), 90 deletions(-)
 delete mode 100644 package/lua/5.2.4/0004-lua-pc.patch
 delete mode 100644 package/lua/5.3.4/0004-lua-pc.patch
 create mode 100644 package/lua/lua.pc.in

Thanks. To avoid merge conflicts, I'll apply this once next is merged back into master.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#2 lore raw

PATCH v2 1/1 lua: refactor with a common template lua.pc.in

In reply to Francois Perrad

Hello,

Quoted 4 lines · Francois Perrad

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 <[email protected]>
Quoted 9 lines
---
 package/lua/5.2.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/5.3.4/0004-lua-pc.patch | 42 -------------------------------------
 package/lua/lua.mk                  | 14 +++++++------
 package/lua/lua.pc.in               | 26 +++++++++++++++++++++++
 4 files changed, 34 insertions(+), 90 deletions(-)
 delete mode 100644 package/lua/5.2.4/0004-lua-pc.patch
 delete mode 100644 package/lua/5.3.4/0004-lua-pc.patch
 create mode 100644 package/lua/lua.pc.in

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com