From: "Ryan Eatmon" <reatmon@ti.com>
To: Yogesh Siraswar <yogeshs@ti.com>,
Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-arago@lists.yoctoproject.org>
Subject: [meta-arago][dunfell-next][PATCH] dma-heap-tests: patch to fix cmake linking issue
Date: Fri, 14 Jan 2022 13:53:03 -0600 [thread overview]
Message-ID: <20220114195303.26088-1-reatmon@ti.com> (raw)
Adding patch to CMakeLists.txt to fix variable name that contains
the libraries to link against.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
.../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
diff --git a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
index fab2b4a0..5d35eb5e 100644
--- a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
+++ b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests.bb
@@ -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"
diff --git a/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
new file mode 100644
index 00000000..8bc744db
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/dma-heap/dma-heap-tests/0001-Variable-name-change-to-fix-compile-error.patch
@@ -0,0 +1,32 @@
+From ab0bb27b915419e3f93b4c0102837e7e748b0667 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+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 <reatmon@ti.com>
+---
+ 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
+
--
2.17.1
next reply other threads:[~2022-01-14 19:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 19:53 Ryan Eatmon [this message]
2022-01-14 22:12 ` [meta-arago][dunfell-next][PATCH] dma-heap-tests: patch to fix cmake linking issue Denys Dmytriyenko
2022-01-19 20:55 ` [EXTERNAL] " Ryan Eatmon
2022-01-19 21:02 ` Denys Dmytriyenko
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=20220114195303.26088-1-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-arago@lists.yoctoproject.org \
--cc=praneeth@ti.com \
--cc=yogeshs@ti.com \
/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.