summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornmenegale <nicolas.menegale@openwide.fr>2013-08-28 09:48:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-02 20:44:19 (GMT)
commit7b5bd3a6ddd04cf32dce82485116f87c614a5ce4 (patch)
tree6b8d1479338f685cdb616ef4f651b93f93320890
parent6492fb02423c091c1c2227a13dfa7e6ee4ba3e1e (diff)
downloadbuildroot-7b5bd3a6ddd04cf32dce82485116f87c614a5ce4.tar.gz
buildroot-7b5bd3a6ddd04cf32dce82485116f87c614a5ce4.tar.bz2
libffi: minor corrections in post install hooks
In order to be sure that we just deal with the includes related with the actual package described into libffi.mk it is better to explicitly specify the version of the libffi we deal with into the post install hook. As dev files are deprecated in target rootfs target post install hook was also deleted. Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libffi/libffi.mk11
1 files changed, 1 insertions, 10 deletions
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
index 0ad5c84..8c84924 100644
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -14,7 +14,7 @@ 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-*/include/*.h $(STAGING_DIR)/usr/include/
+ mv $(STAGING_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(STAGING_DIR)/usr/include/
$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
$(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
rm -rf $(TARGET_DIR)/usr/lib/libffi-*
@@ -22,15 +22,6 @@ endef
LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
-# Similar for target headers
-define LIBFFI_MOVE_TARGET_HEADERS
- install -d $(TARGET_DIR)/usr/include/
- mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h $(TARGET_DIR)/usr/include/
- rm -rf $(TARGET_DIR)/usr/lib/libffi-*
-endef
-
-LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
-
HOST_LIBFFI_AUTORECONF = YES
$(eval $(autotools-package))