aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yegor Yefremov <yegorslists@googlemail.com>2016-01-05 08:17:22 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-02-03 22:31:14 +0100
commitf41091176bb3e8da6cf78760b69f188e9868a259 (patch)
tree3a9a94426e52a1fb2acb7c6cf442e634f5308f1e
parent2b73538920107b6c020ce5c4c8d9f7f672549bb1 (diff)
downloadbuildroot-f41091176bb3e8da6cf78760b69f188e9868a259.tar.gz
buildroot-f41091176bb3e8da6cf78760b69f188e9868a259.tar.bz2
libffi: fix headers location for host-libffi
There is a special hook for target-libffi, that moves headers from /usr/lib/libffi-version/include to /usr/include. This patch adds the same procedure for host-libffi. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> [Thomas: - factorize code between the staging headers cleanup and the host headers cleanup.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libffi/libffi.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 3373c1712c..38ef2d60d0 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -13,15 +13,19 @@ LIBFFI_AUTORECONF = YES
# Move the headers to the usual location, and adjust the .pc file
# accordingly.
-define LIBFFI_MOVE_STAGING_HEADERS
- mv $(STAGING_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(STAGING_DIR)/usr/include/
+define LIBFFI_MOVE_HEADERS
+ mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/
$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
- $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
- rm -rf $(STAGING_DIR)/usr/lib/libffi-*
+ $(1)/usr/lib/pkgconfig/libffi.pc
+ rm -rf $(1)/usr/lib/libffi-*
endef
+LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR))
LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
+HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR))
+HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_MOVE_HOST_HEADERS
+
# Remove headers that are not at the usual location from the target
define LIBFFI_REMOVE_TARGET_HEADERS
$(RM) -rf $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)