From patchwork Thu Apr 5 17:45:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 150999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B51D4B6FBC for ; Fri, 6 Apr 2012 03:51:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 98E5110B587; Thu, 5 Apr 2012 17:51:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K2eS-VeZ3DxC; Thu, 5 Apr 2012 17:51:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5CF5410B5BF; Thu, 5 Apr 2012 17:51:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id CABE38F75B for ; Thu, 5 Apr 2012 17:51:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C71C9A0063 for ; Thu, 5 Apr 2012 17:51:15 +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 ro-F946WfFah for ; Thu, 5 Apr 2012 17:51:15 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by hemlock.osuosl.org (Postfix) with ESMTP id 0A447A004D for ; Thu, 5 Apr 2012 17:51:15 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 04B3296A13; Thu, 5 Apr 2012 17:51:15 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Thu, 5 Apr 2012 19:45:08 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 32f5d03a6e80484d65e88914b993995916488ab8 X-Git-Newrev: f526c4d23c14920c1ce2a94fd50b245124d15d8e X-Patchwork-Hint: ignore Message-Id: <20120405175115.04B3296A13@busybox.osuosl.org> Subject: [Buildroot] [git commit] package: Add protobuf package 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=f526c4d23c14920c1ce2a94fd50b245124d15d8e branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Closes: #4886 [Peter: fix whitespace, C++ dep, optional zlib dep] Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- CHANGES | 3 ++- package/Config.in | 1 + package/protobuf/Config.in | 11 +++++++++++ package/protobuf/protobuf.mk | 21 +++++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/CHANGES b/CHANGES index 44079a5..6ff4004 100644 --- a/CHANGES +++ b/CHANGES @@ -27,7 +27,7 @@ util-linux, vala, wipe, xdriver_xf86-video-fbdev, zlib, New packages: glib-networking, lcdprog, minicom, parted, - zeromq + protobuf, zeromq Deprecated packages: ttcp @@ -36,6 +36,7 @@ Issues resolved (http://bugs.uclibc.org): #4880: New package lcdproc + #4886: New package protobuf 2012.02, Released February 29th, 2012: diff --git a/package/Config.in b/package/Config.in index e4f7dd2..c895cc1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -392,6 +392,7 @@ source "package/liburcu/Config.in" source "package/lttng-libust/Config.in" source "package/orc/Config.in" source "package/poco/Config.in" +source "package/protobuf/Config.in" source "package/startup-notification/Config.in" endmenu diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in new file mode 100644 index 0000000..b044ef0 --- /dev/null +++ b/package/protobuf/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PROTOBUF + bool "protobuf" + depends on BR2_INSTALL_LIBSTDCPP + help + Protocol buffers are Google's language-neutral, platform-neutral, + extensible mechanism for serializing structured data. + + http://code.google.com/p/protobuf/ + +comment "protobuf requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk new file mode 100644 index 0000000..f18261e --- /dev/null +++ b/package/protobuf/protobuf.mk @@ -0,0 +1,21 @@ +############################################################# +# +# protobuf +# +############################################################# +PROTOBUF_VERSION = 2.4.1 +PROTOBUF_SOURCE = protobuf-$(PROTOBUF_VERSION).tar.gz +PROTOBUF_SITE = http://protobuf.googlecode.com/files/ + +# N.B. Need to use host protoc during cross compilation. +PROTOBUF_DEPENDENCIES = host-protobuf +PROTOBUF_CONF_OPT = --with-protoc=$(HOST_DIR)/usr/bin/protoc + +PROTOBUF_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_ZLIB),y) +PROTOBUF_DEPENDENCIES += zlib +endif + +$(eval $(call AUTOTARGETS)) +$(eval $(call AUTOTARGETS,host))