diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-06-28 11:48:17 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-06-29 00:35:58 -0700 |
| commit | 0a5c61ce6cf98074dba9934e497a66885874eba7 (patch) | |
| tree | 091b75e9de35aa243328617e996be561f363d1ee | |
| parent | 145408acff00f0faf25ee51d34dcb9a63cdb0cd1 (diff) | |
| download | meta-openembedded-0a5c61ce6cf98074dba9934e497a66885874eba7.tar.gz | |
protobuf: misc recipe cleanup
Re-order variables to align more closely with the OE style-guide.
Remove spurious ${bindir} from the protobuf-lite packaging rules.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb index 1ffb79da71..8cef391bd7 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb | |||
| @@ -5,32 +5,26 @@ all of its internal RPC protocols and file formats." | |||
| 5 | HOMEPAGE = "https://github.com/google/protobuf" | 5 | HOMEPAGE = "https://github.com/google/protobuf" |
| 6 | SECTION = "console/tools" | 6 | SECTION = "console/tools" |
| 7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
| 8 | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" | |
| 9 | PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" | ||
| 10 | 9 | ||
| 11 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
| 12 | DEPENDS_append_class-target = " protobuf-native" | 11 | DEPENDS_append_class-target = " protobuf-native" |
| 13 | RDEPENDS_${PN}-compiler = "${PN}" | ||
| 14 | RDEPENDS_${PN}-dev += "${PN}-compiler" | ||
| 15 | RDEPENDS_${PN}-ptest = "bash python-protobuf" | ||
| 16 | |||
| 17 | LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" | ||
| 18 | 12 | ||
| 13 | PV .= "+git${SRCPV}" | ||
| 19 | SRCREV = "106ffc04be1abf3ff3399f54ccf149815b287dd9" | 14 | SRCREV = "106ffc04be1abf3ff3399f54ccf149815b287dd9" |
| 20 | 15 | ||
| 21 | PV = "3.5.1+git${SRCPV}" | ||
| 22 | |||
| 23 | SRC_URI = "git://github.com/google/protobuf.git;branch=3.5.x \ | 16 | SRC_URI = "git://github.com/google/protobuf.git;branch=3.5.x \ |
| 24 | file://run-ptest \ | 17 | file://run-ptest \ |
| 25 | " | 18 | " |
| 26 | 19 | ||
| 27 | EXTRA_OECONF += " --with-protoc=echo" | 20 | S = "${WORKDIR}/git" |
| 28 | 21 | ||
| 29 | inherit autotools-brokensep pkgconfig ptest | 22 | inherit autotools-brokensep pkgconfig ptest |
| 30 | 23 | ||
| 31 | S = "${WORKDIR}/git" | 24 | EXTRA_OECONF += "--with-protoc=echo" |
| 32 | TEST_SRC_DIR="examples" | 25 | |
| 33 | LANG_SUPPORT="cpp python" | 26 | TEST_SRC_DIR = "examples" |
| 27 | LANG_SUPPORT = "cpp python" | ||
| 34 | 28 | ||
| 35 | do_compile_ptest() { | 29 | do_compile_ptest() { |
| 36 | # Modify makefile to use the cross-compiler | 30 | # Modify makefile to use the cross-compiler |
| @@ -76,8 +70,14 @@ do_install_ptest() { | |||
| 76 | cd "$olddir" | 70 | cd "$olddir" |
| 77 | } | 71 | } |
| 78 | 72 | ||
| 73 | PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" | ||
| 74 | |||
| 79 | FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" | 75 | FILES_${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" |
| 80 | FILES_${PN}-lite = "${bindir} ${libdir}/libprotobuf-lite${SOLIBS}" | 76 | FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" |
| 77 | |||
| 78 | RDEPENDS_${PN}-compiler = "${PN}" | ||
| 79 | RDEPENDS_${PN}-dev += "${PN}-compiler" | ||
| 80 | RDEPENDS_${PN}-ptest = "bash python-protobuf" | ||
| 81 | 81 | ||
| 82 | MIPS_INSTRUCTION_SET = "mips" | 82 | MIPS_INSTRUCTION_SET = "mips" |
| 83 | 83 | ||
