| Message ID | 20180906172210.42551-9-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Commit | 226e889f6b9b6367d80861968a30b36a1a9c99d9 |
| Headers | show |
| Series | [oe,meta-oe,01/17] pkcs11-helper: Upgrade to 1.25.1 | expand |
I can confirm that issue with new cmake and that this fix fixed it. Thanks! Tested-By: Martin Jansa <Martin.Jansa@gmail.com> On Thu, Sep 6, 2018 at 7:23 PM Khem Raj <raj.khem@gmail.com> wrote: > Backport a pull request to fix build error seen during cross compiling > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > ...tall-non-existing-Encodings-testsuit.patch | 31 +++++++++++++++++++ > meta-oe/recipes-support/poco/poco_1.9.0.bb | 5 +-- > 2 files changed, 34 insertions(+), 2 deletions(-) > create mode 100644 > meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch > > diff --git > a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch > b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch > new file mode 100644 > index 0000000000..f4a358f47f > --- /dev/null > +++ > b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch > @@ -0,0 +1,31 @@ > +From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 > +From: Jochen Sprickerhof <git@jochen.sprickerhof.de> > +Date: Wed, 22 Aug 2018 21:42:09 +0200 > +Subject: [PATCH] Don't try to install non existing > Encodings/testsuite/data > + > +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] > +--- > + Encodings/testsuite/CMakeLists.txt | 5 +---- > + 1 file changed, 1 insertion(+), 4 deletions(-) > + > +diff --git a/Encodings/testsuite/CMakeLists.txt > b/Encodings/testsuite/CMakeLists.txt > +index 7508e5522..79495ae02 100644 > +--- a/Encodings/testsuite/CMakeLists.txt > ++++ b/Encodings/testsuite/CMakeLists.txt > +@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE > + add_executable( ${TESTUNIT} ${TEST_SRCS} ) > + if(ANDROID) > + add_test(NAME ${LIBNAME} WORKING_DIRECTORY > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} > +- COMMAND ${CMAKE_COMMAND} > -DANDROID_NDK=${ANDROID_NDK} > "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" > -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib > -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P > ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) > ++ COMMAND ${CMAKE_COMMAND} > -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib > -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner > -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) > + else() > + add_test(NAME ${LIBNAME} WORKING_DIRECTORY > ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) > +- # The test is run in the build directory. So the test data is > copied there too > +- add_custom_command(TARGET ${TESTUNIT} POST_BUILD > +- COMMAND ${CMAKE_COMMAND} -E > copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data > ${CMAKE_CURRENT_BINARY_DIR}/data ) > + endif() > + #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS > ${RELEASE_CXX_FLAGS} ) > + target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit > ) > +-- > +2.18.0 > + > 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 a4f8a05188..258cc4994f 100644 > --- a/meta-oe/recipes-support/poco/poco_1.9.0.bb > +++ b/meta-oe/recipes-support/poco/poco_1.9.0.bb > @@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" > DEPENDS = "libpcre zlib" > > SRC_URI = " \ > - git://github.com/pocoproject/poco.git \ > + git://github.com/pocoproject/poco.git;branch=poco-${PV} > <http://github.com/pocoproject/poco.git;branch=poco-$%7BPV%7D> \ > + > file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ > file://run-ptest \ > " > -SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d" > +SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" > > S = "${WORKDIR}/git" > > -- > 2.18.0 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch new file mode 100644 index 0000000000..f4a358f47f --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch @@ -0,0 +1,31 @@ +From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 +From: Jochen Sprickerhof <git@jochen.sprickerhof.de> +Date: Wed, 22 Aug 2018 21:42:09 +0200 +Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data + +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] +--- + Encodings/testsuite/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt +index 7508e5522..79495ae02 100644 +--- a/Encodings/testsuite/CMakeLists.txt ++++ b/Encodings/testsuite/CMakeLists.txt +@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE + add_executable( ${TESTUNIT} ${TEST_SRCS} ) + if(ANDROID) + add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) ++ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) + else() + add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) +- # The test is run in the build directory. So the test data is copied there too +- add_custom_command(TARGET ${TESTUNIT} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) + endif() + #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) + target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) +-- +2.18.0 + 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 a4f8a05188..258cc4994f 100644 --- a/meta-oe/recipes-support/poco/poco_1.9.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.9.0.bb @@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ + file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ file://run-ptest \ " -SRCREV = "94966785a8f9ad0191dffd075ebd67826e6e4b6d" +SRCREV = "daf00da73ab917e4d4581e3aa00c0ee61e0cc58b" S = "${WORKDIR}/git"
Backport a pull request to fix build error seen during cross compiling Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...tall-non-existing-Encodings-testsuit.patch | 31 +++++++++++++++++++ meta-oe/recipes-support/poco/poco_1.9.0.bb | 5 +-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel