| Message ID | 757109398.5579025.1377595759907.JavaMail.root@openwide.fr |
|---|---|
| State | Superseded |
| Headers | show |
Hi Nicolas, 2013/8/27 Nicolas Ménégale <nicolas.menegale@openwide.fr> > Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr> > --- > 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(-) > > diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk > index 0ad5c84..96e7940 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-* > @@ -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 > 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,
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 0ad5c84..96e7940 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-* @@ -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
Signed-off-by: Nicolas Ménégale <nicolas.menegale@openwide.fr> --- 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(-)