diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-devtools/protobuf | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/protobuf')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb) | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch | 33 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb) | 42 |
3 files changed, 68 insertions, 25 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb index fe1e6e5fa..7ef030092 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.1.bb @@ -8,24 +8,28 @@ has been split out into the protobuf-c-rpc project." HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" SECTION = "console/tools" LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" DEPENDS = "protobuf-native protobuf" -PACKAGE_BEFORE_PN = "${PN}-compiler" -RDEPENDS_${PN}-compiler = "protobuf-compiler" -RDEPENDS_${PN}-dev += "${PN}-compiler" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" - PV .= "+git${SRCPV}" -SRCREV = "dac1a65feac4ad72f612aab99f487056fbcf5c1a" +SRCREV = "269771b4b45d3aba04e59569f53600003db8d9ff" SRC_URI = "git://github.com/protobuf-c/protobuf-c.git" S = "${WORKDIR}/git" +#make sure c++11 is used +CXXFLAGS += "-std=c++11" +BUILD_CXXFLAGS += "-std=c++11" + inherit autotools pkgconfig +PACKAGE_BEFORE_PN = "${PN}-compiler" + FILES_${PN}-compiler = "${bindir}" +RDEPENDS_${PN}-compiler = "protobuf-compiler" +RDEPENDS_${PN}-dev += "${PN}-compiler" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch new file mode 100644 index 000000000..a2f7a4b77 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch @@ -0,0 +1,33 @@ +From 52959e8e01e39139d18f752e97283e45b4b7a426 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 18 Jul 2018 17:52:34 +0800 +Subject: [PATCH] protobuf: fix configure error + +fix below error: +gnu-configize: 'configure.ac' or 'configure.in' is required + +third_party/googletest is git submodule of protobuf. Above error +caused by missing submodule googletest. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index aec10cf..7fbe57d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,7 +214,6 @@ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) + # too. + export CFLAGS + export CXXFLAGS +-AC_CONFIG_SUBDIRS([third_party/googletest]) + + AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) + AC_OUTPUT +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb index 073dfaef0..cf72d9ca7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb @@ -5,34 +5,29 @@ all of its internal RPC protocols and file formats." HOMEPAGE = "https://github.com/google/protobuf" SECTION = "console/tools" LICENSE = "BSD-3-Clause" - -PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" -DEPENDS_append_class-target = " protobuf-native" -RDEPENDS_${PN}-compiler = "${PN}" -RDEPENDS_${PN}-dev += "${PN}-compiler" -RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" +DEPENDS_append_class-target = " protobuf-native" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" +PV .= "+git${SRCPV}" -SRCREV = "106ffc04be1abf3ff3399f54ccf149815b287dd9" +SRCREV = "48cb18e5c419ddd23d9badcfe4e9df7bde1979b2" -PV = "3.5.1+git${SRCPV}" +SRC_URI = "git://github.com/google/protobuf.git;branch=3.6.x \ + file://run-ptest \ + file://0001-protobuf-fix-configure-error.patch \ +" +S = "${WORKDIR}/git" -SRC_URI = "git://github.com/google/protobuf.git;branch=3.5.x \ - file://run-ptest \ - " +inherit autotools-brokensep pkgconfig ptest PACKAGECONFIG ??= "" PACKAGECONFIG[python] = ",," -EXTRA_OECONF += " --with-protoc=echo" - -inherit autotools-brokensep pkgconfig ptest +EXTRA_OECONF += "--with-protoc=echo" -S = "${WORKDIR}/git" -TEST_SRC_DIR="examples" +TEST_SRC_DIR = "examples" LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" do_compile_ptest() { @@ -79,9 +74,20 @@ do_install_ptest() { cd "$olddir" } +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" + FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" -FILES_${PN}-lite = "${bindir} ${libdir}/libprotobuf-lite${SOLIBS}" +FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" + +RDEPENDS_${PN}-compiler = "${PN}" +RDEPENDS_${PN}-dev += "${PN}-compiler" +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" MIPS_INSTRUCTION_SET = "mips" BBCLASSEXTEND = "native nativesdk" + +LDFLAGS_append_arm = " -latomic" +LDFLAGS_append_mips = " -latomic" +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_mipsel = " -latomic" |