From patchwork Wed Nov 4 17:25:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrique Marks X-Patchwork-Id: 540102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id BB66F140311 for ; Thu, 5 Nov 2015 04:26:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D20158B457; Wed, 4 Nov 2015 17:26:07 +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 ZsPz+fXnTV8W; Wed, 4 Nov 2015 17:26:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DF1098B027; Wed, 4 Nov 2015 17:26:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9CE451C0688 for ; Wed, 4 Nov 2015 17:26:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 992F8930BE for ; Wed, 4 Nov 2015 17:26:03 +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 Xilr8uCxhByw for ; Wed, 4 Nov 2015 17:26:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by hemlock.osuosl.org (Postfix) with ESMTPS id 65D188A466 for ; Wed, 4 Nov 2015 17:26:01 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 252AC1528FF7; Wed, 4 Nov 2015 15:25:03 -0200 (BRST) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 1305A15284A0; Wed, 4 Nov 2015 15:25:03 -0200 (BRST) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mA7hEHKhvYmi; Wed, 4 Nov 2015 15:25:02 -0200 (BRST) Received: from mail.datacom.ind.br (mail.datacom.ind.br [172.25.4.13]) by mail.datacom.ind.br (Postfix) with ESMTP id D5A03152852A; Wed, 4 Nov 2015 15:25:02 -0200 (BRST) Date: Wed, 4 Nov 2015 15:25:02 -0200 (BRST) From: "DATACOM - henrique.marks" To: Steven Noonan Message-ID: <567626037.6062323.1446657902765.JavaMail.zimbra@datacom.ind.br> In-Reply-To: References: <1446626241-25745-1-git-send-email-steven@uplinklabs.net> <20151104120319.30a10287@free-electrons.com> MIME-Version: 1.0 X-Originating-IP: [10.0.1.200] X-Mailer: Zimbra 8.6.0_GA_1169 (ZimbraWebClient - GC45 (Linux)/8.6.0_GA_1169) Thread-Topic: protobuf: bump to 2.6.1 Thread-Index: /LCylIIqiS1nL6lvrIy1JRX/5Bas0A== Cc: Thomas Petazzoni , buildroot@buildroot.org Subject: Re: [Buildroot] [PATCH] protobuf: bump to 2.6.1 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Hello All I was involved in one of those threads, so let me clarify. There was an error in protobuf (upstream) that prevented it being built fot powerpc. In our project, we need protobuf 2.6.1 working with powerpc arch. We have a local build of protobuf 2.6.1 that works with powerpc arch. We just didn't have time to submit it upstream (yet). So, i am going to attach our changes here, so that you can use it together with your work. Tha Patch (0001) corrects the wrong protobuf behaviour, and it is already applied upstream (but not in this version). The rest is the Config.in and protobuf.mk What else must be done: Some other packages, that depends on protobuf, have a dependency on !BR2_powerpc, so they are not built for powerpc just because of protobuf. Now that protobuf builds on powerpc, this restriction can be lifted up. This is what we don't have yet to submit upstream. Thats it, thanks and sorry for the long email. ----- Mensagem original ----- > De: "Steven Noonan" > Para: "Thomas Petazzoni" > Cc: buildroot@buildroot.org > Enviadas: Quarta-feira, 4 de novembro de 2015 14:58:16 > Assunto: Re: [Buildroot] [PATCH] protobuf: bump to 2.6.1 > On Wed, Nov 4, 2015 at 7:28 AM, Steven Noonan wrote: >> On Wed, Nov 4, 2015 at 3:03 AM, Thomas Petazzoni >> wrote: >>> Dear Steven Noonan, >>> >>> On Wed, 4 Nov 2015 00:37:21 -0800, Steven Noonan wrote: >>>> Signed-off-by: Steven Noonan >>>> --- >>>> package/protobuf/protobuf.hash | 2 ++ >>>> package/protobuf/protobuf.mk | 2 +- >>>> 2 files changed, 3 insertions(+), 1 deletion(-) >>>> create mode 100644 package/protobuf/protobuf.hash >>> >>> There have already been several attempts at bumping protobuf to 2.6.x, >>> but each time there were some issues. >>> >>> Search for: >>> >>> Subject: [Buildroot] [PATCH 1/1] protobuf: bump version to 2.6.1 >>> Date: Mon, 22 Jun 2015 14:58:59 -0300 >>> >>> Subject: [Buildroot] [PATCH 1/1] protobuf/protobuf-c: bump versions >>> Date: Thu, 13 Aug 2015 21:41:21 -0400 >>> >>> Can you look into these threads and check that your bump takes into >>> account those problems ? >> >> Thanks for pointing those out. I'll take a look. > > One of the threads I found is confusing. It bumped protobuf to 2.6.1 > but also enabled building for PowerPC. But I see no indication in the > protobuf 2.6.1 sources that PowerPC is a supported architecture, so I > wouldn't have expected it to work -- and the patch was presumably not > applied for that reason. This issue should not affect my patch, as I > didn't touch the architecture requirements in > package/protobuf/Config.in (or in anything depending on protobuf). > > I also saw threads talking about compile problems on pre-GCC 4.7 > toolchains, but I successfully built on x86_64 with as old as GCC 4.4 > (but didn't try older than that). > >>> Most notably, make sure that protobuf-c builds fine, and >>> python-protobuf builds fine. But look at the threads for other >>> potential issues. > > I'll submit a separate patch upgrading protobuf-c to v1.1.1. > > With the protobuf 2.6.1 patch and my [unsubmitted] protobuf-c v1.1.1 > patch, I successfully built with this defconfig (basically > qemu_x86_64_defconfig + protobuf and any packages using it): > > BR2_x86_64=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="4.2" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_TARGET_GENERIC_GETTY_PORT="tty1" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.2.config" > BR2_PACKAGE_OLA=y > BR2_PACKAGE_PYTHON=y > BR2_PACKAGE_PYTHON_PROTOBUF=y > BR2_PACKAGE_PROTOBUF_C=y > BR2_PACKAGE_COLLECTD=y > BR2_PACKAGE_MOSH=y > BR2_TARGET_ROOTFS_EXT2=y > # BR2_TARGET_ROOTFS_TAR is not set > > > And to cover all my bases I also tried the same with a similarly > modified qemu_mipsel_malta_defconfig: > > BR2_mipsel=y > BR2_mips_32r2=y > BR2_KERNEL_HEADERS_VERSION=y > BR2_DEFAULT_KERNEL_VERSION="4.2" > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y > BR2_TOOLCHAIN_BUILDROOT_WCHAR=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-4.2.config" > BR2_LINUX_KERNEL_VMLINUX=y > BR2_PACKAGE_OLA=y > BR2_PACKAGE_PYTHON=y > BR2_PACKAGE_PYTHON_PROTOBUF=y > BR2_PACKAGE_PROTOBUF_C=y > BR2_PACKAGE_COLLECTD=y > BR2_PACKAGE_MOSH=y > BR2_TARGET_ROOTFS_EXT2=y > # BR2_TARGET_ROOTFS_TAR is not set > > > Didn't run into any build problems with either one. > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot From d56c6b19b18dc459c1ea6b720ef015afe72757ea Mon Sep 17 00:00:00 2001 From: Henrique Marks Date: Fri, 28 Aug 2015 18:55:49 -0300 Subject: [PATCH 1/1] Syntax Error Patch Signed-off-by: Henrique Marks --- src/google/protobuf/stubs/atomicops.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index b1336e3..a130b38 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -162,7 +162,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // Include our platform specific implementation. #define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \ -#error "Atomic operations are not supported on your platform" +"Atomic operations are not supported on your platform" // ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html. #if defined(THREAD_SANITIZER) @@ -172,7 +172,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) #include #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // Solaris @@ -203,15 +203,15 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #if __has_extension(c_atomic) #include #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // Unknown. #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR #endif // On some platforms we need additional declarations to make AtomicWord -- 1.9.1