Date: Sun, 22 Mar 2026 15:36:31 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 556216d0e2cd - main - databases/soci: Fix build with non-default options Message-ID: <69c00c7f.22bc4.3740efa0@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=556216d0e2cd0405addf33846a7cb5efda64979c commit 556216d0e2cd0405addf33846a7cb5efda64979c Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-03-22 15:22:29 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-22 15:22:29 +0000 databases/soci: Fix build with non-default options Upstream renamed options from WITH_* to SOCI_*. Also fix dependencies for MYSQL option. Approved by: jbo (maintainer) --- databases/soci/Makefile | 16 +++++++++------- databases/soci/pkg-plist | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/databases/soci/Makefile b/databases/soci/Makefile index aab0665bfab0..42d05ce64ceb 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -1,6 +1,7 @@ PORTNAME= soci DISTVERSIONPREFIX= v DISTVERSION= 4.1.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= jbo@FreeBSD.org @@ -17,7 +18,7 @@ GH_ACCOUNT= SOCI USE_LDCONFIG= yes -CMAKE_OFF= WITH_ORACLE +CMAKE_OFF= SOCI_DB2 SOCI_ORACLE OPTIONS_DEFINE= BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT= BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE @@ -40,19 +41,20 @@ BOOST_LIB_DEPENDS= libboost_date_time.so:devel/boost-libs BOOST_CMAKE_BOOL= WITH_BOOST FIREBIRD_USES= firebird -FIREBIRD_CMAKE_BOOL= WITH_FIREBIRD +FIREBIRD_CMAKE_BOOL= SOCI_FIREBIRD -MYSQL_USES= mysql -MYSQL_CMAKE_BOOL= WITH_MYSQL +MYSQL_LIB_DEPENDS= libunwind.so:devel/libunwind +MYSQL_USES= mysql ssl +MYSQL_CMAKE_BOOL= SOCI_MYSQL ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -ODBC_CMAKE_BOOL= WITH_ODBC +ODBC_CMAKE_BOOL= SOCI_ODBC ODBC_CMAKE_ON= -DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so PGSQL_USES= pgsql -PGSQL_CMAKE_BOOL= WITH_POSTGRESQL +PGSQL_CMAKE_BOOL= SOCI_POSTGRESQL SQLITE_USES= sqlite -SQLITE_CMAKE_BOOL= WITH_SQLITE3 +SQLITE_CMAKE_BOOL= SOCI_SQLITE3 .include <bsd.port.mk> diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist index 399dea57b169..13294e806a1f 100644 --- a/databases/soci/pkg-plist +++ b/databases/soci/pkg-plist @@ -62,18 +62,18 @@ lib/cmake/soci-4.1.2/SOCICoreTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/soci-4.1.2/SOCICoreTargets.cmake lib/cmake/soci-4.1.2/SOCIEmptyTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/soci-4.1.2/SOCIEmptyTargets.cmake -lib/cmake/soci-4.1.2/SOCIFirebirdTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/soci-4.1.2/SOCIFirebirdTargets.cmake -lib/cmake/soci-4.1.2/SOCIMySQLTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/soci-4.1.2/SOCIMySQLTargets.cmake -lib/cmake/soci-4.1.2/SOCIODBCTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/soci-4.1.2/SOCIODBCTargets.cmake -lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets.cmake -lib/cmake/soci-4.1.2/SOCISQLite3Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/soci-4.1.2/SOCISQLite3Targets.cmake -lib/cmake/soci-4.1.2/find_package_files/FindFirebird.cmake -lib/cmake/soci-4.1.2/find_package_files/FindMySQL.cmake +%%FIREBIRD%%lib/cmake/soci-4.1.2/SOCIFirebirdTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%FIREBIRD%%lib/cmake/soci-4.1.2/SOCIFirebirdTargets.cmake +%%MYSQL%%lib/cmake/soci-4.1.2/SOCIMySQLTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%MYSQL%%lib/cmake/soci-4.1.2/SOCIMySQLTargets.cmake +%%ODBC%%lib/cmake/soci-4.1.2/SOCIODBCTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%ODBC%%lib/cmake/soci-4.1.2/SOCIODBCTargets.cmake +%%PGSQL%%lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%PGSQL%%lib/cmake/soci-4.1.2/SOCIPostgreSQLTargets.cmake +%%SQLITE%%lib/cmake/soci-4.1.2/SOCISQLite3Targets-%%CMAKE_BUILD_TYPE%%.cmake +%%SQLITE%%lib/cmake/soci-4.1.2/SOCISQLite3Targets.cmake +%%FIREBIRD%%lib/cmake/soci-4.1.2/find_package_files/FindFirebird.cmake +%%MYSQL%%lib/cmake/soci-4.1.2/find_package_files/FindMySQL.cmake lib/cmake/soci-4.1.2/soci-config-version.cmake lib/cmake/soci-4.1.2/soci-config.cmake lib/libsoci_core.sohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c00c7f.22bc4.3740efa0>