aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2017-07-05 13:14:39 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-05 16:06:37 +0200
commita82680a61871f5fb96e307a1dfb28a0a330e98d3 (patch)
treee8c2b1e54d355ceed6d7ce6fd700b3c7ab6e1855
parent6999e61394ba06fd05565f6b8fda9a13c464f884 (diff)
downloadbuildroot-a82680a61871f5fb96e307a1dfb28a0a330e98d3.tar.gz
buildroot-a82680a61871f5fb96e307a1dfb28a0a330e98d3.tar.bz2
libffi: avoid $(HOST_DIR)/usr while moving headers
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libffi/libffi.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 38ef2d60d0..32e01e9cd1 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -14,13 +14,13 @@ LIBFFI_AUTORECONF = YES
# Move the headers to the usual location, and adjust the .pc file
# accordingly.
define LIBFFI_MOVE_HEADERS
- mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/
+ mv $(1)/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/include/
$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
- $(1)/usr/lib/pkgconfig/libffi.pc
- rm -rf $(1)/usr/lib/libffi-*
+ $(1)/lib/pkgconfig/libffi.pc
+ rm -rf $(1)/lib/libffi-*
endef
-LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR))
+LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR)/usr)
LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR))