summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@gmail.com>2016-05-01 23:22:08 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-01 23:29:56 +0200
commite05a5b8e342f94aae7d79fe648003dd1a65ebc41 (patch)
tree51e2045992ba8b676960ed42285881e490ede1e5
parent3f4a88209a4eecfda4935aa86a03a09276712417 (diff)
downloadbuildroot-e05a5b8e342f94aae7d79fe648003dd1a65ebc41.tar.gz
buildroot-e05a5b8e342f94aae7d79fe648003dd1a65ebc41.zip
luajit: fix host installation
Packages installed for the host should have their prefix set to $(HOST_DIR)/usr, and therefore not use DESTDIR at installation time. Using PREFIX=/usr DESTDIR=$(HOST_DIR) is wrong, and leads for example to luajit.pc containing prefix=/usr, which means pkg-config returns incorrect results for host-luajit. This patch fixes the luajit package to conform to this rule. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> [Thomas: rewrite commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/luajit/luajit.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 623bfcc5f7..81a26603cb 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))
OpenPOWER on IntegriCloud