Skip to contentSkip to conversation

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

PATCH Superseded Romain Naour 2 participants 3 messages May 1, 2016 – May 2, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

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

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

It should be:

$ output/host/usr/bin/pkgconf --cflags luajit
[...]output/host/usr/include/luajit-2.0

Set PREFIX with $(HOST_DIR)/usr and remove DESTDIR since the installation path is DPREFIX=$(DESTDIR)$(PREFIX).
Otherwise the host-luajit is installed to output/host/home/[...]/output/host/usr

Cc Gustavo Zacarias <[email protected]>

---
v2: remove the post install hook and set PREFIX with $(HOST_DIR)/usr (ThomasP)

---
 package/luajit/luajit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/luajit/luajit.mk +2 -2
index 623bfcc..81a2660 100644
@@ -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))
Signature · 1 line
2.5.5
#1 lore raw

PATCH v2 1/1 package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

Hello,

Quoted 14 lines · Romain Naour

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

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

It should be:

$ output/host/usr/bin/pkgconf --cflags luajit
[...]output/host/usr/include/luajit-2.0

Set PREFIX with $(HOST_DIR)/usr and remove DESTDIR since the installation path is DPREFIX=$(DESTDIR)$(PREFIX).
Otherwise the host-luajit is installed to output/host/home/[...]/output/host/usr

Quoted 7 lines
Cc Gustavo Zacarias <[email protected]>

---
v2: remove the post install hook and set PREFIX with $(HOST_DIR)/usr (ThomasP)

---
 package/luajit/luajit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

I've quite significantly rewritten the commit log, and applied, thanks!

Thomas

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

PATCH v2 1/1 package/luajit: luajit.pc: return the path to host-luajit from the Buildroot package

Hello,

Le 1 mai 2016 23:32, "Thomas Petazzoni" <[email protected]> a ?crit :

Quoted 5 lines

Hello,

Quoted 1 line · Romain Naour

The luajit.pc file is manually generated in the luajit Makefile, so it

give a wrong

Quoted 10 lines
Quoted 10 lines

path for host-luajit.

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

It should be:

$ output/host/usr/bin/pkgconf --cflags luajit
[...]output/host/usr/include/luajit-2.0

Set PREFIX with $(HOST_DIR)/usr and remove DESTDIR since the

installation path

Quoted 2 lines
Quoted 2 lines

is DPREFIX=$(DESTDIR)$(PREFIX).
Otherwise the host-luajit is installed to

output/host/home/[...]/output/host/usr

Quoted 5 lines
Quoted 5 lines
Cc Gustavo Zacarias <[email protected]>

---
v2: remove the post install hook and set PREFIX with $(HOST_DIR)/usr

(ThomasP)

Quoted 5 lines
Quoted 3 lines
---
 package/luajit/luajit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

I've quite significantly rewritten the commit log, and applied, thanks!

OK, thanks.

Romain

Quoted 6 lines

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160502/98173d42/attachment.html>