From patchwork Thu Apr 20 14:06:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Rugiero X-Patchwork-Id: 752822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w80zG0ZMnz9s4s for ; Fri, 21 Apr 2017 00:06:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b8boXKMZ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B2EC88828; Thu, 20 Apr 2017 14:06:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bfVvi2wGvSUr; Thu, 20 Apr 2017 14:06:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 436B788A56; Thu, 20 Apr 2017 14:06:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5F72A1C1E9A for ; Thu, 20 Apr 2017 14:06:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 51D5A8956D for ; Thu, 20 Apr 2017 14:06:27 +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 je5U83GW-3iq for ; Thu, 20 Apr 2017 14:06:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id F216E86CC5 for ; Thu, 20 Apr 2017 14:06:24 +0000 (UTC) Received: by mail-qt0-f171.google.com with SMTP id m36so45746189qtb.0 for ; Thu, 20 Apr 2017 07:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=378FPhyinxoSh0snwLUhIZPVLzywf+tSml9+c1FRklE=; b=b8boXKMZw/4mE8FAKZkqBo0aVZv9I3veyC9Tp41wMo9u949UQvu98YhJkA43t2tmln aoaZXI52QOJMyGgjczLw7R5iv4PMw11MflcgHrVCv+gXJiBWo5hL8NHy9V3l6D27yD9m aQf+aEx5WHEeERN9PJISHzKwsEtakA6vAGt+lefPr4ru1ec1rcu5FgJ30uvkoXyXYYhV Y1qfB5uIAjnZ1d5jrPzSOqf7Pa8Q0uSO3z9cgfRSnsG8Wf75DDNUchsCsxOIXq89QC6D NeQ6AGwUWvHj7AYrzbmWhP97EFoxziDzoG/hHceeFG+LjNwg76Tds2XPv/yRFdseBbAA 9BfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=378FPhyinxoSh0snwLUhIZPVLzywf+tSml9+c1FRklE=; b=AuCvcPKAf6RxmXx5tMwG+aP98QGSQ/YkQ3lAUdJfvBcfH6nDqsnvJ0QJBSh7Me7FOf hhW8QGWblK6D/t4phC8hbc2JhXtKad9R1FYFeakRLlU3CwrPzEEfRjoAURFBu4evgDyD PG8pb5MUYqdfgjZbfWqxzPJhkhX1LTKW+KvsOFGWvu8ZoKdKilWQOlGdGAtUqTBYGV6Q gG6jECvMNIE/NeVo6i6BMZFOcpNUNm+xmqKW5GKzBSbpXNIDU3K4gMJ4bH9OHxkGUMTw i0xJr90AYCZZlhehMvwbrjWGSHwRBdpjPsbeT3gK+3fcKBStbC1zdur8XYyeehk9Ji8c SXfA== X-Gm-Message-State: AN3rC/6pt44Qlmn6YLRpzQIEK6tzkdQCByadYSzZbkR/akUq2q5l9uPY Kb7VkU7oZk3jSjYg65Q= X-Received: by 10.237.59.89 with SMTP id q25mr8867282qte.121.1492697183431; Thu, 20 Apr 2017 07:06:23 -0700 (PDT) Received: from localhost ([190.104.247.43]) by smtp.gmail.com with ESMTPSA id l10sm435005qte.15.2017.04.20.07.06.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Apr 2017 07:06:22 -0700 (PDT) From: mrugiero@gmail.com To: buildroot@busybox.net Date: Thu, 20 Apr 2017 11:06:14 -0300 Message-Id: <20170420140614.25998-1-mrugiero@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170417172225.20472-1-mrugiero@gmail.com> References: <20170417172225.20472-1-mrugiero@gmail.com> Cc: "Mario J. Rugiero" Subject: [Buildroot] [PATCH v2] package: protobuf/python-protobuf: bump to v3.2.0. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: "Mario J. Rugiero" Both packages are coupled, so both were bumped and build-tested. The atomics' support patch is no longer needed, and neither is the autoreconf option, and SPARC64 is no longer broken. To make sure of this, one config of each of the following archs was tested (base defconfig in parens): PowerPC (qemu_ppc_g3beige_defconfig) SPARC (qemu_sparc_ss10_defconfig) SPARC64 (qemu_sparc64_sun4u_defconfig) Signed-off-by: Mario J. Rugiero --- ...configure.ac-check-if-libatomic-is-needed.patch | 34 ---------------------- package/protobuf/Config.in | 19 +----------- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 7 ++--- package/python-protobuf/python-protobuf.hash | 3 +- package/python-protobuf/python-protobuf.mk | 2 +- 6 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch mode change 120000 => 100644 package/python-protobuf/python-protobuf.hash diff --git a/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch b/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch deleted file mode 100644 index fffdf49fa..000000000 --- a/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f020fe05a20dfcd16cd7df833dcf3cdeef770538 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Thu, 11 Feb 2016 10:58:35 -0200 -Subject: [PATCH 2/2] configure.ac: check if libatomic is needed - -Compilation of protobuf for PowerPC and SPARC may fail due to missing -references to __atomic_fetch_add_4 and __atomic_compare_exchange_4. - -The __atomic_*() intrinsics for all sizes are provided by libatomic when -gcc is >= 4.8. This can be achieved by adding this to configure.ac: - - AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) - -Signed-off-by: Carlos Santos ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c07067c..88d4a0d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,6 +160,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"]) - # We still keep this for improving pbconfig.h for unsupported platforms. - AC_CXX_STL_HASH - -+AC_SEARCH_LIBS([__atomic_load_4], [atomic]) -+ - case "$target_os" in - mingw* | cygwin* | win*) - ;; --- -2.5.0 - diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index bece56c29..0d33f5c76 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -1,22 +1,5 @@ # See src/google/protobuf/stubs/platform_macros.h for supported archs. # -# On PowerPC, the __atomic_*() built-ins for 1-byte, 2-byte and 4-byte -# types are available built-in. However, the __atomic_*() built-ins for -# 8-byte types is implemented via libatomic, so only available since gcc -# 4.8. -# -# In Buildroot, to simplify things, we've decided to simply require gcc -# 4.8 as soon as the architectures has at least one __atomic_*() built-in -# variant that requires libatomic. -# -# Since protobuf most likely only uses the 1, 2 and 4-byte variants, it -# *could* technically build with gcc 4.7. This is probably not a big deal, -# and we can live with requiring gcc 4.8 on PowerPC to build protobuf. -# -# The SPARC64 build fails due to a missing definition of Atomic64. This -# has been fixed on the master branch but the build still breaks due to -# undefined references to internal NoBarrier_Atomic*() functions. -# # host-protobuf only builds on certain architectures config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS bool @@ -24,8 +7,8 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_i386 default y if BR2_mipsel default y if BR2_x86_64 + default y if BR2_sparc64 default y if BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_sparc64 # missing definition of Atomic64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_USE_MMU # fork() diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index b681650a1..9ec6bc759 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f5b3563f118f1d3d6e001705fa7082e8fc3bda50038ac3dff787650795734146 protobuf-v3.0.0.tar.gz +sha256 51d773e4297238b282eaa4c1dd317099675b12eef2b414732b851c00459225c6 protobuf-cpp-3.2.0.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 72930c1fe..a3e96d4f8 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,12 +7,11 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works, as they share the same # version/site variables. -PROTOBUF_VERSION = v3.0.0 -PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION)) +PROTOBUF_VERSION = 3.2.0 +PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz +PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE -# no configure script -PROTOBUF_AUTORECONF = YES # N.B. Need to use host protoc during cross compilation. PROTOBUF_DEPENDENCIES = host-protobuf diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash deleted file mode 120000 index 57a40ce5b..000000000 --- a/package/python-protobuf/python-protobuf.hash +++ /dev/null @@ -1 +0,0 @@ -../protobuf/protobuf.hash \ No newline at end of file diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash new file mode 100644 index 000000000..c87403f24 --- /dev/null +++ b/package/python-protobuf/python-protobuf.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c574e2b2178ffe66599274e8cfa11ecf83799a7992be30f0b68fb33ea0a0f1af protobuf-python-3.2.0.tar.gz diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index 5a6488918..b91ba4933 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE) +PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE