From patchwork Wed Aug 28 09:48:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: nmenegale X-Patchwork-Id: 270422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id E4C3E2C00A3 for ; Wed, 28 Aug 2013 19:49:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A073331793; Wed, 28 Aug 2013 09:49:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Sbfi2R52RrnB; Wed, 28 Aug 2013 09:49:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 75E7B30019; Wed, 28 Aug 2013 09:49:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 290341BF82F for ; Wed, 28 Aug 2013 09:49:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1F4E0844CC for ; Wed, 28 Aug 2013 09:49:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yH7J7ClPfnRC for ; Wed, 28 Aug 2013 09:49:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from zimbra3.corp.accelance.fr (zimbra3.corp.accelance.fr [213.162.49.233]) by whitealder.osuosl.org (Postfix) with ESMTP id 71ED883E1A for ; Wed, 28 Aug 2013 09:49:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra3.corp.accelance.fr (Postfix) with ESMTP id 5B00F689A7 for ; Wed, 28 Aug 2013 11:49:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra3.corp.accelance.fr Received: from zimbra3.corp.accelance.fr ([127.0.0.1]) by localhost (zimbra3.corp.accelance.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nR9rkM0exl-Q for ; Wed, 28 Aug 2013 11:48:59 +0200 (CEST) Received: from zimbra2.corp.accelance.fr (zimbra2.corp.accelance.fr [213.162.49.232]) by zimbra3.corp.accelance.fr (Postfix) with ESMTP id 5DD63689A2 for ; Wed, 28 Aug 2013 11:48:59 +0200 (CEST) Date: Wed, 28 Aug 2013 11:48:59 +0200 (CEST) From: Nicolas =?utf-8?B?TcOpbsOpZ2FsZQ==?= To: buildroot@busybox.net Message-ID: <1493594999.5624151.1377683339178.JavaMail.root@openwide.fr> MIME-Version: 1.0 X-Originating-IP: [217.108.83.254] X-Mailer: Zimbra 7.2.2_GA_2852 (ZimbraWebClient - GC23 (Linux)/7.2.2_GA_2852) Subject: [Buildroot] [PATCH v2 1/1] libffi: minor corrections in post install hooks X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 Reviewed-by: Thomas Petazzoni --- 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(-) 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))