diff mbox series

[meta-oe,master,scarthgap] soci: update build options

Message ID 20240423105233.1307395-1-peter.marko@siemens.com
State Under Review
Headers show
Series [meta-oe,master,scarthgap] soci: update build options | expand

Commit Message

Peter Marko April 23, 2024, 10:52 a.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

* make it possible to configure build without boost
* build tests only when requested
* disable build of IBM proprietary DB2 which does not have recipe
  (this creates some cmake warnings if enabled without dependency)
* EXTRA_OECONF is empty with cmake build
* remove SOCI_LIBDIR which was removed in upgrade to v4.0.2
* use WITH_* instedad of SOCI_* as SOCI defines still search
  for dependencies unnecessarily and WITH define automatically
  enables SOCI define, too

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 meta-oe/recipes-dbs/soci/soci_4.0.3.bb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb
index 25d67ff8b..315f5d515 100644
--- a/meta-oe/recipes-dbs/soci/soci_4.0.3.bb
+++ b/meta-oe/recipes-dbs/soci/soci_4.0.3.bb
@@ -3,7 +3,6 @@  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 \
@@ -18,20 +17,20 @@  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[sqlite3] = "-DWITH_SQLITE3=ON,-DWITH_SQLITE3=OFF,sqlite3,"
+PACKAGECONFIG[mysql] = "-DWITH_MYSQL=ON,-DWITH_MYSQL=OFF,mariadb,"
+PACKAGECONFIG[postgresql] = "-DWITH_POSTGRESQL=ON,-DWITH_POSTGRESQL=OFF,postgresql,"
+PACKAGECONFIG[odbc] = "-DWITH_ODBC=ON,-DWITH_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},,,"
+PACKAGECONFIG[boost] = "-DWITH_BOOST=ON,-DWITH_BOOST=OFF,boost"
+PACKAGECONFIG[ptest] = "${TESTCONFIG},-DSOCI_TESTS=OFF,,"
 
 # enable your backend by default we enable 'empty'
-PACKAGECONFIG ??= "empty"
+PACKAGECONFIG ??= "boost empty"
 
-# Take the flags added by PACKAGECONFIG and pass them to cmake.
-EXTRA_OECMAKE = "${EXTRA_OECONF} -DSOCI_LIBDIR=${libdir}"
+EXTRA_OECMAKE = "-DWITH_DB2=OFF"
 DISABLE_STATIC = ""
 
 inherit dos2unix cmake