From 4a55cb62130feb69fa7ce1b2112af22e8d574018 Mon Sep 17 00:00:00 2001 From: Jianchuan Wang Date: Mon, 7 Sep 2015 13:29:56 +0800 Subject: protobuf-c: upgrade 0.15 -> 1.1.1 Signed-off-by: Jianchuan Wang Signed-off-by: Bruce Ashfield --- ...Remove-the-rules-which-depend-on-the-nati.patch | 46 ++++++++++++++++++++++ recipes-containers/criu/protobuf-c_0.15.bb | 22 ----------- recipes-containers/criu/protobuf-c_1.1.1.bb | 24 +++++++++++ 3 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch delete mode 100644 recipes-containers/criu/protobuf-c_0.15.bb create mode 100644 recipes-containers/criu/protobuf-c_1.1.1.bb diff --git a/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch b/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch new file mode 100644 index 00000000..b6fbf017 --- /dev/null +++ b/recipes-containers/criu/files/0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch @@ -0,0 +1,46 @@ +From 81bc5928cdc1b432656eb6590967306d8cf3ac9d Mon Sep 17 00:00:00 2001 +From: Jianchuan Wang +Date: Tue, 4 Aug 2015 10:22:21 +0800 +Subject: [PATCH] protobuf-c: Remove the rules which depend on the native + command + +Those rules are not for cross-compile since the command protoc-c/cxx-generate-packed-data +need be executed to generate some local files in the compiling processing. + +Signed-off-by: Jianchuan Wang +--- + Makefile.am | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 310aa09..0602e96 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -148,17 +148,18 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ + t_generated_code2_cxx_generate_packed_data_LDADD = \ + $(protobuf_LIBS) + +-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto +- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto ++t/test.pb-c.c t/test.pb-c.h: $(top_srcdir)/t/test.proto ++ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto + +-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test-full.proto +- $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto ++t/test-full.pb-c.c t/test-full.pb-c.h: $(top_srcdir)/t/test-full.proto ++ $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto + + t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto + $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto + +-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) +- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc ++t/generated-code2/test-full-cxx-output.inc: ++ mkdir -p $(top_builddir)/t/generated-code2 ++ $(AM_V_GEN)cxx-generate-packed-data > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc + + BUILT_SOURCES += \ + t/test.pb-c.c t/test.pb-c.h \ +-- +1.9.1 + diff --git a/recipes-containers/criu/protobuf-c_0.15.bb b/recipes-containers/criu/protobuf-c_0.15.bb deleted file mode 100644 index 5d65c69a..00000000 --- a/recipes-containers/criu/protobuf-c_0.15.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "protobuf-c" -DESCRIPTION = "This package provides a code generator and runtime libraries to use Protocol Buffers from pure C" -HOMEPAGE = "http://code.google.com/p/protobuf-c/" -SECTION = "console/tools" -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://src/google/protobuf-c/protobuf-c.c;endline=33;md5=333140fae7cf8a38dc5f980ddb63704b" - -PR = "r0" - -COMPATIBLE_HOST = "(x86_64|arm).*-linux" - -DEPENDS = "protobuf" - -SRC_URI[md5sum] = "73ff0c8df50d2eee75269ad8f8c07dc8" -SRC_URI[sha256sum] = "8fcb538e13a5431c46168fc8f2e6ad2574e2db9b684c0c72b066e24f010a0036" -SRC_URI = "http://protobuf-c.googlecode.com/files/protobuf-c-${PV}.tar.gz \ - file://disable_tests.patch" - -inherit autotools - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-containers/criu/protobuf-c_1.1.1.bb b/recipes-containers/criu/protobuf-c_1.1.1.bb new file mode 100644 index 00000000..8c2d2b73 --- /dev/null +++ b/recipes-containers/criu/protobuf-c_1.1.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "protobuf-c" +DESCRIPTION = "This package provides a code generator and runtime libraries to use Protocol Buffers from pure C" +HOMEPAGE = "http://code.google.com/p/protobuf-c/" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://protobuf-c/protobuf-c.c;endline=28;md5=0feb44cc63eacef97219b0174967492f" + +COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" + +DEPENDS = "protobuf protobuf-c-native" + +SRC_URI[md5sum] = "41d437677ea16f9d3611d98841c4af3b" +SRC_URI[sha256sum] = "09c5bb187b7a8e86bc0ff860f7df86370be9e8661cdb99c1072dcdab0763562c" +SRC_URI = "https://github.com/protobuf-c/protobuf-c/releases/download/v1.1.1/protobuf-c-1.1.1.tar.gz " +SRC_URI_append_class-target ="file://0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" + +do_install_append_class-native() { + install -m 755 ${B}/t/generated-code2/cxx-generate-packed-data ${D}/${bindir} +} -- cgit v1.2.3-54-g00ecf