From patchwork Tue Feb 19 10:55:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 221663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 0589E2C02AA for ; Tue, 19 Feb 2013 21:56:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EC9FB8BA84; Tue, 19 Feb 2013 10:56:02 +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 H7WhHeWof5YE; Tue, 19 Feb 2013 10:56:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B8878AED7; Tue, 19 Feb 2013 10:56:00 +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 F0A478F75B for ; Tue, 19 Feb 2013 10:56:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8AEA38AED7 for ; Tue, 19 Feb 2013 10:55:58 +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 ez77uJJrwbtm for ; Tue, 19 Feb 2013 10:55:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 357268ABF1 for ; Tue, 19 Feb 2013 10:55:57 +0000 (UTC) From: Markos Chandras To: Date: Tue, 19 Feb 2013 10:55:47 +0000 Message-ID: <1361271347-21435-1-git-send-email-markos.chandras@gmail.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01181__2013_02_19_10_55_54 Subject: [Buildroot] [PATCH] libffi: Revert git changes and bump to 3.0.12 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 From: Markos Chandras Signed-off-by: Markos Chandras --- package/libffi/libffi.mk | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 9fb86d7..99f56c6 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,15 +4,11 @@ # ############################################################# -LIBFFI_VERSION = bcc0c28001b6d427d5cd8037d2e3c892babc6b4c -LIBFFI_SITE = http://github.com/atgreen/libffi/tarball/$(LIBFFI_VERSION) +LIBFFI_VERSION = 3.0.12 +LIBFFI_SITE = ftp://sourceware.org/pub/libffi/ LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES - -# We're using a version from Git which strangely bundles a generated -# configure script, but it's broken (doesn't generate the libffi.pc -# file). LIBFFI_AUTORECONF = YES # Newer CS MIPS toolchains use a different (compact) eh_frame format @@ -22,11 +18,9 @@ LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" endif # Move the headers to the usual location, and adjust the .pc file -# accordingly. For some reason, the libffi build system forgets to -# install the .pc file, so we do it manually. +# accordingly. define LIBFFI_MOVE_STAGING_HEADERS mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/ - $(INSTALL) -D -m 0644 $(@D)/libffi.pc $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc $(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc $(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc rm -rf $(TARGET_DIR)/usr/lib/libffi-* @@ -43,18 +37,5 @@ endef LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS -# We're using a version from Git which strangely bundles a generated -# configure script, but it's broken (doesn't generate the libffi.pc -# file). -HOST_LIBFFI_AUTORECONF = YES - -# For some reason, the libffi build system forgets to install the .pc -# file, so we do it manually. -define HOST_LIBFFI_INSTALL_PC_FILE - $(INSTALL) -D $(@D)/libffi.pc $(HOST_DIR)/usr/lib/pkgconfig/libffi.pc -endef - -HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_INSTALL_PC_FILE - $(eval $(autotools-package)) $(eval $(host-autotools-package))