[Buildroot] [PATCH] package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

[Buildroot] [PATCH] package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

[Romain Naour]

The luajit.pc file is manually generated in the luajit Makefile, so it give a wrong
path for host-luajit.

$ host/usr/bin/pkgconf --cflags luajit
/usr/include/luajit-2.0

It should be:
$ host/usr/bin/pkgconf --cflags luajit
[...]output/host/usr/include/luajit-2.0

Add a port install hook to fix luajit.pc for host-luajit.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/luajit/luajit.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 623bfcc..0aab04d 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -75,5 +75,11 @@ define HOST_LUAJIT_INSTALL_CMDS
 	$(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" LDCONFIG=true -C $(@D) install
 endef
 
+define HOST_LUAJIT_FIX_PC_FILE
+	sed -i -e "s|^prefix=.*|prefix=$(HOST_DIR)/usr|" $(HOST_DIR)/usr/lib/pkgconfig/luajit.pc
+endef
+
+HOST_LUAJIT_POST_INSTALL_HOOKS = HOST_LUAJIT_FIX_PC_FILE
+
 $(eval $(generic-package))
 $(eval $(host-generic-package))
-- 
2.5.5

[Buildroot] [PATCH] package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

[Thomas Petazzoni]

Hello,

On Sun,  1 May 2016 22:50:00 +0200, Romain Naour wrote:
> The luajit.pc file is manually generated in the luajit Makefile, so it give a wrong
> path for host-luajit.
> 
> $ host/usr/bin/pkgconf --cflags luajit
> /usr/include/luajit-2.0
> 
> It should be:
> $ host/usr/bin/pkgconf --cflags luajit
> [...]output/host/usr/include/luajit-2.0
> 
> Add a port install hook to fix luajit.pc for host-luajit.
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>

That's the wrong solution. The proper solution is:

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 623bfcc..81a2660 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -66,13 +66,13 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 
 # host-efl package needs host-luajit to be linked dynamically.
 define HOST_LUAJIT_BUILD_CMDS
-       $(MAKE) PREFIX="/usr" BUILDMODE=dynamic \
+       $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \
                TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
                -C $(@D) amalg
 endef
 
 define HOST_LUAJIT_INSTALL_CMDS
-       $(MAKE) PREFIX="/usr" DESTDIR="$(HOST_DIR)" LDCONFIG=true -C $(@D) install
+       $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install
 endef
 
 $(eval $(generic-package))

Indeed, for host packages, the prefix should be $(HOST_DIR)/usr.

Thanks!

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