mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 06:16:04 +01:00
libyang: update from 2.0.7 to 2.0.164
Modify the patch since the removal of pcre2-config is no long needed as upstream now does: 75518cf7 cmake FEATURE read pcre2 version from header and created an upstream PR as per new Upstream-Status. The flag for building the test code was changed from ENABLE_BUILD_TESTS to just ENABLE_TESTS in: cdffdabb build REFACTOR rename test option to unify with other projects Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
5ee9c9ca08
commit
0fdc02d0f9
|
|
@ -0,0 +1,35 @@
|
|||
From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001
|
||||
From: Tony Tascioglu <tony.tascioglu@windriver.com>
|
||||
Date: Mon, 21 Jun 2021 12:34:22 -0400
|
||||
Subject: [PATCH] libyang: fix initial build errors
|
||||
|
||||
This patch addresses build errors seen when integrating libyang as a
|
||||
recipe.
|
||||
|
||||
There is a missing include statement for stdint.h in utests.h which
|
||||
causes build problems. stdint.h is required to be imported by cmocka.h
|
||||
prior to the cmocka file. Adding the stdint allows it to build the
|
||||
tests correctly
|
||||
|
||||
Upstream-Status: Submitted [ https://github.com/CESNET/libyang/pull/1819 ]
|
||||
|
||||
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
|
||||
Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
|
||||
---
|
||||
tests/utests/utests.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/utests/utests.h b/tests/utests/utests.h
|
||||
index 7e85a66e..8eee26ce 100644
|
||||
--- a/tests/utests/utests.h
|
||||
+++ b/tests/utests/utests.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include <cmocka.h>
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001
|
||||
From: Tony Tascioglu <tony.tascioglu@windriver.com>
|
||||
Date: Mon, 21 Jun 2021 12:34:22 -0400
|
||||
Subject: [PATCH] libyang: fix initial build errors
|
||||
|
||||
This patch addresses build errors seen when integrating libyang as a
|
||||
recipe.
|
||||
|
||||
The call to pcre2-config has been commented out. *-config calls are
|
||||
being replaced by pkgconfig, and we want to avoid the binary config
|
||||
calls. This call can safely be discarded since it is used to check
|
||||
the version of libpcre2 on the system, and all recent YP builds meet
|
||||
the minimum required version (v10.21).
|
||||
|
||||
There is a missing include statement for stdint.h in utests.h which
|
||||
causes build problems. stdint.h is required to be imported by cmocka.h
|
||||
prior to the cmocka file. Adding the stdint allows it to build the
|
||||
tests correctly
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com>
|
||||
---
|
||||
CMakeModules/FindPCRE2.cmake | 2 +-
|
||||
tests/utests/utests.h | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeModules/FindPCRE2.cmake b/CMakeModules/FindPCRE2.cmake
|
||||
index 8f60daa2..ad014f14 100644
|
||||
--- a/CMakeModules/FindPCRE2.cmake
|
||||
+++ b/CMakeModules/FindPCRE2.cmake
|
||||
@@ -12,7 +12,7 @@ FIND_PATH(PCRE2_INCLUDE_DIR pcre2.h)
|
||||
FIND_LIBRARY(PCRE2_LIBRARY NAMES libpcre2.a pcre2-8)
|
||||
|
||||
# Check required version
|
||||
-execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+# execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
||||
# Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE.
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
diff --git a/tests/utests/utests.h b/tests/utests/utests.h
|
||||
index 5bea0459..a256120c 100644
|
||||
--- a/tests/utests/utests.h
|
||||
+++ b/tests/utests/utests.h
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
#include <string.h>
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
|
@ -6,15 +6,16 @@ LICENSE = "BSD-3-Clause"
|
|||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
|
||||
|
||||
SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56"
|
||||
SRCREV = "a0cc89516ab5eca84d01c85309f320a94752a64c"
|
||||
|
||||
SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
|
||||
file://libyang-skip-pcre2-config-add-stdint-h.patch \
|
||||
file://libyang-add-stdint-h.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
# Due to valgrind not supported on these arches:
|
||||
COMPATIBLE_HOST:riscv32 = "null"
|
||||
COMPATIBLE_HOST:armv5 = "null"
|
||||
COMPATIBLE_HOST:riscv64 = "null"
|
||||
|
|
@ -29,7 +30,7 @@ BINCONFIG = "${bindir}/pcre2-config"
|
|||
RDEPENDS:${PN}-ptest += "valgrind"
|
||||
|
||||
EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
|
||||
EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_BUILD_TESTS=ON', '', d)}"
|
||||
EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON', '', d)}"
|
||||
|
||||
do_install_ptest () {
|
||||
cp -fR ${B}/tests/ ${D}${PTEST_PATH}/
|
||||
Loading…
Reference in New Issue
Block a user