Patchwork [v2,1/1] libffi: minor corrections in post install hooks

login
register
mail settings
Submitter nmenegale
Date Aug. 28, 2013, 9:48 a.m.
Message ID <1493594999.5624151.1377683339178.JavaMail.root@openwide.fr>
Download mbox | patch
Permalink /patch/270422/
State Accepted
Headers show

Comments

nmenegale - Aug. 28, 2013, 9:48 a.m.
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>
---
v2: third commit
Commit log was clarified.
Also the post install target hook was removed due to the reason
explained in the current commit log.
---
 package/libffi/libffi.mk |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
Thomas Petazzoni - Aug. 28, 2013, 9:58 a.m.
Dear Nicolas Ménégale,

On Wed, 28 Aug 2013 11:48:59 +0200 (CEST), Nicolas Ménégale wrote:
> 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>

Thanks!
Peter Korsgaard - Sept. 2, 2013, 8:49 p.m.
>>>>> "Nicolas" == Nicolas Ménégale <nicolas.menegale@openwide.fr> writes:

 Nicolas> In order to be sure that we just deal with the includes related with
 Nicolas> the actual package described into libffi.mk it is better to explicitly
 Nicolas> specify the version of the libffi we deal with into the post install
 Nicolas> hook.
 Nicolas> As dev files are deprecated in target rootfs target post install
 Nicolas> hook was also deleted.

Committed, thanks.

Patch

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))