dma-heap-tests: patch to fix cmake linking issue
PATCH 1/1 dma-heap-tests: patch to fix cmake linking issue
Adding patch to CMakeLists.txt to fix variable name that contains the libraries to link against.
--- .../dma-heap/dma-heap-tests.bb | 4 ++- ...ble-name-change-to-fix-compile-error.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb +3 -1
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://src/heap_test_fixture.cpp;beginline=1;endline=15;md5= PV = "1.0" BRANCH = "master" -SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH}" +SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH} \ + file://0001-Variable-name-change-to-fix-compile-error.patch \ +" SRCREV = "bccbfbf24baccefa09439a924f61f04e82b3910a" DEPENDS = "googletest"
meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch new file +32 -0
@@ -0,0 +1,32 @@ +From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Thu, 13 Jan 2022 20:00:27 -0600 +Subject: [dma-heap-tests][PATCH] Variable name change to fix compile error. + +It appears that a recent change in the GTest CMake integration +changed the variable names for the libraries. This fixes that +issue and makes the compile work under Yocto. + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71d7225..7d4a97f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,8 +19,8 @@ target_include_directories(dma-heap-unit-tests + ) + + target_link_libraries(dma-heap-unit-tests +- ${GTEST_LIBRARY} +- ${GTEST_MAIN_LIBRARY} ++ ${GTEST_LIBRARIES} ++ ${GTEST_MAIN_LIBRARIES} + pthread + ) + +-- +2.17.1 +
Signature · 1 line
2.17.1
Looks good overall. Couple nit-picks:
1. dunfell-next tag in the subject - should probably be dunfell/master instead?
2. what's the Upstream-Status: of the cmake patch?
Quoted 65 lines · Ryan Eatmon via lists.yoctoproject.org
Adding patch to CMakeLists.txt to fix variable name that contains the libraries to link against.
Signed-off-by Ryan Eatmon <[email protected]>--- .../dma-heap/dma-heap-tests.bb | 4 ++- ...ble-name-change-to-fix-compile-error.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patchmeta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb +3
-1@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://src/heap_test_fixture.cpp;beginline=1;endline=15;md5= PV = "1.0" BRANCH = "master" -SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH}" +SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH} \ + file://0001-Variable-name-change-to-fix-compile-error.patch \ +" SRCREV = "bccbfbf24baccefa09439a924f61f04e82b3910a" DEPENDS = "googletest"meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch new file +32
-0@@ -0,0 +1,32 @@ +From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Thu, 13 Jan 2022 20:00:27 -0600 +Subject: [dma-heap-tests][PATCH] Variable name change to fix compile error. + +It appears that a recent change in the GTest CMake integration +changed the variable names for the libraries. This fixes that +issue and makes the compile work under Yocto. + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71d7225..7d4a97f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,8 +19,8 @@ target_include_directories(dma-heap-unit-tests + ) + + target_link_libraries(dma-heap-unit-tests +- ${GTEST_LIBRARY} +- ${GTEST_MAIN_LIBRARY} ++ ${GTEST_LIBRARIES} ++ ${GTEST_MAIN_LIBRARIES} + pthread + ) + +-- +2.17.1 +Signature · 1 line
2.17.1
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Yes, I'm going to send out a second version of this patch shortly. As for the upstream, we are working out how best in the long run to handle this packages upstream, but likely I will be doing a pull request to the github repository before the end of the week.
Quoted 73 lines · Denys Dmytriyenko
Looks good overall. Couple nit-picks:
1. dunfell-next tag in the subject - should probably be dunfell/master instead?
2. what's the Upstream-Status: of the cmake patch?Quoted 65 lines · Ryan Eatmon via lists.yoctoproject.org
Adding patch to CMakeLists.txt to fix variable name that contains the libraries to link against.
Signed-off-by Ryan Eatmon <[email protected]>--- .../dma-heap/dma-heap-tests.bb | 4 ++- ...ble-name-change-to-fix-compile-error.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-)create mode 100644
meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patchmeta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb +3
-1@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://src/heap_test_fixture.cpp;beginline=1;endline=15;md5= PV = "1.0" BRANCH = "master" -SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH}" +SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH} \ + file://0001-Variable-name-change-to-fix-compile-error.patch \ +" SRCREV = "bccbfbf24baccefa09439a924f61f04e82b3910a" DEPENDS = "googletest"meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch new file +32
-0@@ -0,0 +1,32 @@ +From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Thu, 13 Jan 2022 20:00:27 -0600 +Subject: [dma-heap-tests][PATCH] Variable name change to fix compile error. + +It appears that a recent change in the GTest CMake integration +changed the variable names for the libraries. This fixes that +issue and makes the compile work under Yocto. + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71d7225..7d4a97f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,8 +19,8 @@ target_include_directories(dma-heap-unit-tests + ) + + target_link_libraries(dma-heap-unit-tests +- ${GTEST_LIBRARY} +- ${GTEST_MAIN_LIBRARY} ++ ${GTEST_LIBRARIES} ++ ${GTEST_MAIN_LIBRARIES} + pthread + ) + +-- +2.17.1 +Signature · 1 line
2.17.1
Signature · 2 lines
Ryan Eatmon [email protected]
Thanks. In that case you might want to add:
Upstream-Status: Pending
It should be in the cmake patch itself, not in the recipe patch that includes the other one.
Quoted 84 lines · Ryan Eatmon
Yes, I'm going to send out a second version of this patch shortly. As for the upstream, we are working out how best in the long run to handle this packages upstream, but likely I will be doing a pull request to the github repository before the end of the week.
Quoted 71 lines · Denys Dmytriyenko
Looks good overall. Couple nit-picks:
1. dunfell-next tag in the subject - should probably be dunfell/master instead?
2. what's the Upstream-Status: of the cmake patch?Quoted 63 lines · Ryan Eatmon via lists.yoctoproject.org
Adding patch to CMakeLists.txt to fix variable name that contains the libraries to link against.
Signed-off-by Ryan Eatmon <[email protected]>--- .../dma-heap/dma-heap-tests.bb | 4 ++- ...ble-name-change-to-fix-compile-error.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patchmeta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb +3
-1@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://src/heap_test_fixture.cpp;beginline=1;endline=15;md5= PV = "1.0" BRANCH = "master" -SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH}" +SRC_URI = "git://github.com/glneo/dma-heap-tests.git;protocol=https;branch=${BRANCH} \ + file://0001-Variable-name-change-to-fix-compile-error.patch \ +" SRCREV = "bccbfbf24baccefa09439a924f61f04e82b3910a" DEPENDS = "googletest"meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch new file +32
-0@@ -0,0 +1,32 @@ +From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Thu, 13 Jan 2022 20:00:27 -0600 +Subject: [dma-heap-tests][PATCH] Variable name change to fix compile error. + +It appears that a recent change in the GTest CMake integration +changed the variable names for the libraries. This fixes that +issue and makes the compile work under Yocto. + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71d7225..7d4a97f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,8 +19,8 @@ target_include_directories(dma-heap-unit-tests + ) + + target_link_libraries(dma-heap-unit-tests +- ${GTEST_LIBRARY} +- ${GTEST_MAIN_LIBRARY} ++ ${GTEST_LIBRARIES} ++ ${GTEST_MAIN_LIBRARIES} + pthread + ) + +-- +2.17.1 +Signature · 1 line
2.17.1Signature · 2 lines
Ryan Eatmon [email protected]
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964