Skip to contentSkip to conversation

libffi: minor corrections in post install hooks

PATCH New Nicolas Ménégale 3 participants 3 messages Aug 28, 2013 – Sep 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
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(-)
package/libffi/libffi.mk +1 -10
index 0ad5c84..8c84924 100644
@@ -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))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 libffi: minor corrections in post install hooks

Dear Nicolas M?n?gale,

Quoted 8 lines · Nicolas M?n?gale

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.

Thanks!

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 libffi: minor corrections in post install hooks

In reply to Nicolas Ménégale
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Nicolas" == Nicolas M?n?gale <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard