Skip to contentSkip to conversation

libffi: minor corrections in post install hooks

PATCH New Nicolas Ménégale 2 participants 2 messages Aug 27, 2013 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Nicolas Ménégale

author
#1 lore raw

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

Signed-off-by Nicolas M?n?gale <[email protected]>

---
v0: initial commit
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 hooks.

---
 package/libffi/libffi.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/libffi/libffi.mk +2 -2
index 0ad5c84..96e7940 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-*

@@ -25,7 +25,7 @@ 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/
+	mv $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(TARGET_DIR)/usr/include/
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
Signature · 1 line
1.7.9.5
#2 lore raw

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

Hi Nicolas,

2013/8/27 Nicolas M?n?gale <[email protected]>

Quoted 30 lines
Signed-off-by Nicolas M?n?gale <[email protected]>

---
v0: initial commit
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 hooks.

---
 package/libffi/libffi.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/libffi/libffi.mk +0 -1
index 0ad5c84..96e7940 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-*
package/libffi/libffi.mk +0 -0
@@ -25,7 +25,7 @@ LIBFFI_POST_INSTALL_STAGING_HOOKS +=

LIBFFI_MOVE_STAGING_HEADERS
# Similar for target headers
define LIBFFI_MOVE_TARGET_HEADERS

Quoted 8 lines
        install -d $(TARGET_DIR)/usr/include/

- mv $(TARGET_DIR)/usr/lib/libffi-*/include/*.h
$(TARGET_DIR)/usr/include/
+ mv $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h
$(TARGET_DIR)/usr/include/

        rm -rf $(TARGET_DIR)/usr/lib/libffi-*

endef

Since we deprecated dev. files installation in the target rootfs and we no longer
support building gcc for the target, I think you can simply remove the LIBFFI_MOVE_TARGET_HEADERS hook.

Regards,

Signature · 4 lines
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130827/618644c3/attachment.html>