diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2017-07-31 23:17:59 +0200 |
|---|---|---|
| committer | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2017-08-10 12:54:57 +0200 |
| commit | 8d845683e37640d33c186c0091ccce6ae3ef0777 (patch) | |
| tree | 87bc4964d659b0754cd0b21165dbea517f4a4031 | |
| parent | 7d6cd3677a1f1caab6b67fc369bd7073f687b38f (diff) | |
| download | buildroot-8d845683e37640d33c186c0091ccce6ae3ef0777.tar.gz buildroot-8d845683e37640d33c186c0091ccce6ae3ef0777.zip | |
lua: fix pkg-config file
When Lua is linked with additional libraries, these libraries should go
into the pkg-config file as well.
Otherwise, linking swupdate with the lua library fails:
```
/home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlopen'
/home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlclose'
/home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlerror'
/home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlsym'
```
Fixes http://autobuild.buildroot.net/results/1c3/1c349cc5904868e4def292b9fbfa164828e46156
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
| -rw-r--r-- | package/lua/5.2.4/0004-lua-pc.patch | 4 | ||||
| -rw-r--r-- | package/lua/5.3.4/0004-lua-pc.patch | 4 | ||||
| -rw-r--r-- | package/lua/lua.mk | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/package/lua/5.2.4/0004-lua-pc.patch b/package/lua/5.2.4/0004-lua-pc.patch index 62acb201f2..31ff61157a 100644 --- a/package/lua/5.2.4/0004-lua-pc.patch +++ b/package/lua/5.2.4/0004-lua-pc.patch @@ -1,6 +1,8 @@ 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 =================================================================== @@ -34,7 +36,7 @@ Index: b/etc/lua.pc +Description: An Extensible Extension Language +Version: ${R} +Requires: -+Libs: -L${libdir} -llua -lm ++Libs: -L${libdir} -llua -lm @MYLIBS@ +Cflags: -I${includedir} + +# (end of lua.pc) diff --git a/package/lua/5.3.4/0004-lua-pc.patch b/package/lua/5.3.4/0004-lua-pc.patch index 615a7db8fc..11258329d1 100644 --- a/package/lua/5.3.4/0004-lua-pc.patch +++ b/package/lua/5.3.4/0004-lua-pc.patch @@ -1,6 +1,8 @@ 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 =================================================================== @@ -34,7 +36,7 @@ Index: b/etc/lua.pc +Description: An Extensible Extension Language +Version: ${R} +Requires: -+Libs: -L${libdir} -llua -lm ++Libs: -L${libdir} -llua -lm @MYLIBS@ +Cflags: -I${includedir} + +# (end of lua.pc) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 93339ad9ce..0692c53764 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -86,8 +86,8 @@ endef define LUA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc + sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ + > $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc endef define LUA_INSTALL_TARGET_CMDS @@ -96,8 +96,8 @@ endef define HOST_LUA_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(HOST_DIR)/lib/pkgconfig/lua.pc + sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ + > $(HOST_DIR)/lib/pkgconfig/lua.pc endef $(eval $(generic-package)) |
