From: Trevor Woerner <twoerner@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][master-next][PATCH 01/11] poco: variable cleanup
Date: Thu, 24 May 2018 14:26:49 -0400 [thread overview]
Message-ID: <20180524182659.19986-2-twoerner@gmail.com> (raw)
In-Reply-To: <20180524182659.19986-1-twoerner@gmail.com>
Reorder recipe variables according to:
https://www.openembedded.org/wiki/Styleguide
Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
meta-oe/recipes-support/poco/poco_1.9.0.bb | 44 +++++++++++-----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/meta-oe/recipes-support/poco/poco_1.9.0.bb b/meta-oe/recipes-support/poco/poco_1.9.0.bb
index 1016caef7c..a4f8a05188 100644
--- a/meta-oe/recipes-support/poco/poco_1.9.0.bb
+++ b/meta-oe/recipes-support/poco/poco_1.9.0.bb
@@ -1,34 +1,22 @@
SUMMARY = "Modern, powerful open source cross-platform C++ class libraries"
DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems."
-SECTION = "libs"
HOMEPAGE = "http://pocoproject.org/"
+SECTION = "libs"
LICENSE = "BSL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
# These dependencies are required by Foundation
DEPENDS = "libpcre zlib"
-inherit cmake ptest
-
-BBCLASSEXTEND = "native"
-
-SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d"
SRC_URI = " \
git://github.com/pocoproject/poco.git \
file://run-ptest \
"
+SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d"
S = "${WORKDIR}/git"
-EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
- -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
- ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
-
-# For the native build we want to use the bundled version
-EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
-
-# do not use rpath
-EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
+inherit cmake ptest
# By default the most commonly used poco components are built
# Foundation is built anyway and doesn't need to be listed explicitly
@@ -60,6 +48,16 @@ PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OF
PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF"
PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF"
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
+ -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
+ ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
+
+# For the native build we want to use the bundled version
+EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF"
+
+# do not use rpath
+EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON"
+
python populate_packages_prepend () {
poco_libdir = d.expand('${libdir}')
pn = d.getVar("PN")
@@ -77,6 +75,14 @@ python populate_packages_prepend () {
d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners))
}
+do_install_ptest () {
+ cp -rf ${B}/bin/ ${D}${PTEST_PATH}
+ cp -f ${B}/lib/libCppUnit.so* ${D}${libdir}
+ cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/
+ find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \;
+ echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners"
+}
+
PACKAGES_DYNAMIC = "poco-.*"
# "poco" is a metapackage which pulls in all Poco components
@@ -89,10 +95,4 @@ ALLOW_EMPTY_${PN}-cppunit = "1"
RDEPENDS_${PN}-ptest += "${PN}-cppunit"
-do_install_ptest () {
- cp -rf ${B}/bin/ ${D}${PTEST_PATH}
- cp -f ${B}/lib/libCppUnit.so* ${D}${libdir}
- cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/
- find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \;
- echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners"
-}
+BBCLASSEXTEND = "native"
--
2.17.0.582.gccdcbd54c
next prev parent reply other threads:[~2018-05-24 18:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 18:26 [meta-oe][master-next][PATCH 00/11] reorder variable Trevor Woerner
2018-05-24 18:26 ` Trevor Woerner [this message]
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 02/11] libssh: variable cleanup Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 03/11] libftdi: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 04/11] gflags: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 05/11] ceres-solver: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 06/11] openjpeg: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 07/11] glm: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 08/11] msgpack-c: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 09/11] json-spirit: " Trevor Woerner
2018-05-31 16:56 ` Khem Raj
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 10/11] capnproto: " Trevor Woerner
2018-05-24 18:26 ` [meta-oe][master-next][PATCH 11/11] openobex: " Trevor Woerner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524182659.19986-2-twoerner@gmail.com \
--to=twoerner@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.