From a82680a61871f5fb96e307a1dfb28a0a330e98d3 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 5 Jul 2017 13:14:39 +0200 Subject: [PATCH] libffi: avoid $(HOST_DIR)/usr while moving headers Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libffi/libffi.mk | 8 ++++---- 1 file 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)) -- 2.30.2