added my Recipes
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
Define SOCI_LIBDIR only if its not passed via environemnt. In OE we
|
||||
want to set it per our choice since we use 'lib' for 64bit unless we
|
||||
are using multilib
|
||||
|
||||
-Khem
|
||||
|
||||
Index: soci-3.2.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- soci-3.2.2.orig/CMakeLists.txt
|
||||
+++ soci-3.2.2/CMakeLists.txt
|
||||
@@ -69,11 +69,12 @@ include(SociDependencies)
|
||||
###############################################################################
|
||||
# Installation
|
||||
###############################################################################
|
||||
-
|
||||
-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
- set(SOCI_LIBDIR "lib")
|
||||
-else()
|
||||
- set(SOCI_LIBDIR "lib64")
|
||||
+if(NOT DEFINED SOCI_LIBDIR)
|
||||
+ if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
+ set(SOCI_LIBDIR "lib")
|
||||
+ else()
|
||||
+ set(SOCI_LIBDIR "lib")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
|
||||
45
meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb
Normal file
45
meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb
Normal file
@@ -0,0 +1,45 @@
|
||||
DESCRIPTION = "The C++ Database Access Library"
|
||||
HOMEPAGE = "http://soci.sourceforge.net"
|
||||
LICENSE = "BSL-1.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
||||
SECTION = "libs"
|
||||
DEPENDS = "boost"
|
||||
|
||||
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"
|
||||
|
||||
TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \
|
||||
-DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \
|
||||
-DSOCI_TEST_MYSQL_CONNSTR:STRING="db=soci_test user=oe password=oe"'
|
||||
|
||||
OBASEDIR ?= "/opt/oracle"
|
||||
OINCDIR = "rdbms/public"
|
||||
OLIBDIR = "lib"
|
||||
|
||||
PACKAGECONFIG[sqlite3] = "-DSOCI_SQLITE3=ON,-DSOCI_SQLITE3=OFF,sqlite3,"
|
||||
PACKAGECONFIG[mysql] = "-DSOCI_MYSQL=ON,-DSOCI_MYSQL=OFF,mariadb,"
|
||||
PACKAGECONFIG[postgresql] = "-DSOCI_POSTGRESQL=ON,-DSOCI_POSTGRESQL=OFF,postgresql,"
|
||||
PACKAGECONFIG[odbc] = "-DSOCI_ODBC=ON,-DSOCI_ODBC=OFF,,"
|
||||
PACKAGECONFIG[empty] = "-DSOCI_EMPTY=ON,-DSOCI_EMPTY=OFF,,"
|
||||
PACKAGECONFIG[oracle] = "-DWITH_ORACLE=ON --with-oracle-include=${OINCDIR} --with-oracle-lib=${OLIBDIR},-DWITH_ORACLE=OFF,,"
|
||||
PACKAGECONFIG[firebird] = "-DWITH_FIREBIRD=ON,-DWITH_FIREBIRD=OFF,,"
|
||||
PACKAGECONFIG[ptest] = "${TESTCONFIG},,,"
|
||||
|
||||
# enable your backend by default we enable 'empty'
|
||||
PACKAGECONFIG ??= "empty"
|
||||
|
||||
# Take the flags added by PACKAGECONFIG and pass them to cmake.
|
||||
EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}"
|
||||
DISABLE_STATIC = ""
|
||||
|
||||
inherit dos2unix cmake
|
||||
|
||||
PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle"
|
||||
|
||||
FILES:${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*"
|
||||
FILES:${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*"
|
||||
FILES:${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*"
|
||||
FILES:${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*"
|
||||
FILES:${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*"
|
||||
Reference in New Issue
Block a user