From 32f1fc8fd733d7c1a4da2844b0259f9f6691894e Mon Sep 17 00:00:00 2001
From: Jesse Gilles <jgilles@multitech.com>
Date: Mon, 3 Oct 2011 17:07:18 -0500
Subject: protobuf: add 2.4.1, use BBCLASSEXTEND for native
---
multitech/recipes/protobuf/protobuf-native_2.3.0.bb | 7 -------
multitech/recipes/protobuf/protobuf.inc | 9 +++++++++
multitech/recipes/protobuf/protobuf_2.3.0.bb | 10 +++-------
multitech/recipes/protobuf/protobuf_2.4.1.bb | 7 +++++++
4 files changed, 19 insertions(+), 14 deletions(-)
delete mode 100644 multitech/recipes/protobuf/protobuf-native_2.3.0.bb
create mode 100644 multitech/recipes/protobuf/protobuf_2.4.1.bb
(limited to 'multitech')
diff --git a/multitech/recipes/protobuf/protobuf-native_2.3.0.bb b/multitech/recipes/protobuf/protobuf-native_2.3.0.bb
deleted file mode 100644
index c2b79de..0000000
--- a/multitech/recipes/protobuf/protobuf-native_2.3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require protobuf.inc
-
-PR = "r0"
-
-SRC_URI[tarball.md5sum] = f2964f636b3c67d1e9d8b90819fa8ddb
-
-inherit native
diff --git a/multitech/recipes/protobuf/protobuf.inc b/multitech/recipes/protobuf/protobuf.inc
index 0869a14..23d1677 100644
--- a/multitech/recipes/protobuf/protobuf.inc
+++ b/multitech/recipes/protobuf/protobuf.inc
@@ -2,7 +2,16 @@ DESCRIPTION = "Google Protocol Buffers"
HOMEPAGE = "http://www.google.com/"
PRIORITY = "optional"
LICENSE = "BSD"
+INC_PR = "r0"
+BBCLASSEXTEND = "native"
+
+DEPENDS = "protobuf-native"
+DEPENDS_virtclass-native = ""
SRC_URI = "http://protobuf.googlecode.com/files/protobuf-${PV}.tar.bz2;name=tarball"
inherit autotools
+
+# use native protoc for running unit tests
+EXTRA_OECONF = " --with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
+EXTRA_OECONF_virtclass-native = ""
diff --git a/multitech/recipes/protobuf/protobuf_2.3.0.bb b/multitech/recipes/protobuf/protobuf_2.3.0.bb
index 6efb8f7..99f3e75 100644
--- a/multitech/recipes/protobuf/protobuf_2.3.0.bb
+++ b/multitech/recipes/protobuf/protobuf_2.3.0.bb
@@ -1,11 +1,7 @@
require protobuf.inc
-PR = "r0"
+PR = "${INC_PR}.0"
-DEPENDS = "protobuf-native"
-
-SRC_URI[tarball.md5sum] = f2964f636b3c67d1e9d8b90819fa8ddb
-
-# use native protoc for running unit tests
-EXTRA_OECONF += "--with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
+SRC_URI[tarball.md5sum] = "f2964f636b3c67d1e9d8b90819fa8ddb"
+SRC_URI[tarball.sha256sum] = "760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac"
diff --git a/multitech/recipes/protobuf/protobuf_2.4.1.bb b/multitech/recipes/protobuf/protobuf_2.4.1.bb
new file mode 100644
index 0000000..0531ac3
--- /dev/null
+++ b/multitech/recipes/protobuf/protobuf_2.4.1.bb
@@ -0,0 +1,7 @@
+require protobuf.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[tarball.md5sum] = "ed436802019c9e1f40cc750eaf78f318"
+SRC_URI[tarball.sha256sum] = "cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf"
+
--
cgit v1.2.3