mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 06:16:04 +01:00
soci: upgrade 4.0.3 -> 4.1.2
New version includes support to build against CMake 4+. Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
a7504ae1c2
commit
27eab454a6
|
|
@ -1,32 +0,0 @@
|
|||
From e5f72c656829402c6f70e7416039bc18f0c26485 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 30 Aug 2022 22:17:14 -0700
|
||||
Subject: [PATCH] Do not use std::shuffle with clang 15
|
||||
|
||||
This fails to compile although its preferred approach for c++11 and
|
||||
newer
|
||||
|
||||
See
|
||||
https://github.com/SOCI/soci/issues/984
|
||||
|
||||
Upstream-Status: Inappropriate [Workaround]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
cmake/SociConfig.cmake | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake
|
||||
index 492e1837..f24fd9a6 100644
|
||||
--- a/cmake/SociConfig.cmake
|
||||
+++ b/cmake/SociConfig.cmake
|
||||
@@ -94,6 +94,7 @@ else()
|
||||
set(SOCI_CXX11 ON)
|
||||
set(SOCI_CXX_VERSION_FLAGS "-std=c++11")
|
||||
add_definitions(-DCATCH_CONFIG_CPP11_NO_IS_ENUM)
|
||||
+ add_definitions(-DCATCH_CONFIG_CPP11_NO_SHUFFLE)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SOCI_GCC_CLANG_COMMON_FLAGS} ${SOCI_CXX_VERSION_FLAGS}")
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
|||
SECTION = "libs"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \
|
||||
file://0001-Do-not-use-std-shuffle-with-clang-15.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "615e5f7e4b52007f3a3b4050a99aadf6346b56b5098eb08b3a650836083c6a33"
|
||||
SRC_URI[sha256sum] = "b79afe73db241f762ddb611fe11184cbf6da44ba99f90721515daa2f978ff38e"
|
||||
|
||||
TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \
|
||||
-DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \
|
||||
|
|
@ -44,5 +43,5 @@ FILES:${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*"
|
|||
FILES:${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*"
|
||||
|
||||
do_install:append() {
|
||||
sed -i 's|${RECIPE_SYSROOT}${prefix}|${_IMPORT_PREFIX}|g' ${D}${libdir}/cmake/SOCI/SOCITargets*.cmake
|
||||
sed -i 's|${RECIPE_SYSROOT}${prefix}|${_IMPORT_PREFIX}|g' ${D}${libdir}/cmake/${BPN}-${PV}/SOCI*Targets.cmake
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user