* [gentoo-commits] repo/proj/guru:master commit in: dev-db/soci/
@ 2024-12-14 11:46 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-12-14 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 45d66397fb075bb928e384dc227143dacc54145f
Author: Jan-Espen Oversand <sigsegv <AT> radiotube <DOT> org>
AuthorDate: Fri Dec 13 23:24:40 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Dec 13 23:24:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45d66397
dev-db/soci: add use flags for backends and cmake flags
Signed-off-by: Jan-Espen Oversand <sigsegv <AT> radiotube.org>
dev-db/soci/metadata.xml | 5 ++++
dev-db/soci/soci-4.0.3-r1.ebuild | 50 ++++++++++++++++++++++++++++++++++++++++
dev-db/soci/soci-4.0.3.ebuild | 28 ----------------------
3 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/dev-db/soci/metadata.xml b/dev-db/soci/metadata.xml
index e64cd5769..69b1e1d6a 100644
--- a/dev-db/soci/metadata.xml
+++ b/dev-db/soci/metadata.xml
@@ -5,6 +5,11 @@
<email>sigsegv@radiotube.org</email>
<description>Jan-Espen Oversand</description>
</maintainer>
+ <use>
+ <flag name="ubsan">Enable running with UB sanitizer</flag>
+ <flag name="shared">Enable dynamic linking with shared objects</flag>
+ <flag name="cxx11">Enable c++11 support</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">soci</remote-id>
</upstream>
diff --git a/dev-db/soci/soci-4.0.3-r1.ebuild b/dev-db/soci/soci-4.0.3-r1.ebuild
new file mode 100644
index 000000000..3ca7b75a7
--- /dev/null
+++ b/dev-db/soci/soci-4.0.3-r1.ebuild
@@ -0,0 +1,50 @@
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SOCI - The C++ Database Access Library"
+HOMEPAGE="https://sourceforge.net/projects/soci/"
+SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/download -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="odbc sqlite oracle postgres mysql +shared +static test ubsan lto cxx11"
+REQUIRED_USE="|| ( shared static )"
+RESTRICT="!test? ( test )"
+
+CMAKE_SKIP_TESTS=(
+ soci_odbc_test_mssql
+ soci_odbc_test_mssql_static
+ soci_odbc_test_mysql
+ soci_odbc_test_mysql_static
+ soci_odbc_test_postgresql
+ soci_odbc_test_postgresql_static
+ soci_postgresql_test
+ soci_postgresql_test_static
+ soci_mysql_test
+ soci_mysql_test_static
+)
+
+RDEPEND="
+ >=dev-libs/boost-1.85.0-r1
+ odbc? ( dev-db/unixODBC )
+ sqlite? ( dev-db/sqlite )
+ oracle? ( dev-db/oracle-instantclient[sdk] )
+ postgres? ( dev-db/postgresql )
+ mysql? ( dev-db/mysql )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DSOCI_SHARED="$(usex shared)"
+ -DSOCI_STATIC="$(usex static)"
+ -DSOCI_TESTS="$(usex test)"
+ -DSOCI_UBSAN="$(usex ubsan)"
+ -DSOCI_LTO="$(usex lto)"
+ -DSOCI_CXX11="$(usex cxx11)"
+ )
+ cmake_src_configure
+}
diff --git a/dev-db/soci/soci-4.0.3.ebuild b/dev-db/soci/soci-4.0.3.ebuild
deleted file mode 100644
index dfdd6ed83..000000000
--- a/dev-db/soci/soci-4.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="SOCI - The C++ Database Access Library"
-HOMEPAGE="https://sourceforge.net/projects/soci/"
-SRC_URI="https://sourceforge.net/projects/soci/files/soci/soci-4.0.3/${P}.tar.gz/download -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CMAKE_SKIP_TESTS=(
- soci_odbc_test_mssql
- soci_odbc_test_mssql_static
- soci_odbc_test_mysql
- soci_odbc_test_mysql_static
- soci_odbc_test_postgresql
- soci_odbc_test_postgresql_static
- soci_postgresql_test
- soci_postgresql_test_static
-)
-
-RDEPEND=">=dev-libs/boost-1.85.0-r1 >=dev-db/unixODBC-2.3.12 >=dev-db/sqlite-3.46.1"
-DEPEND="${RDEPEND}"
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-db/soci/
@ 2024-12-14 12:58 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-12-14 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 836024f4de672161f8247a42db5d350e9faa8d56
Author: Jan-Espen Oversand <sigsegv <AT> radiotube <DOT> org>
AuthorDate: Sat Dec 14 12:22:01 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Dec 14 12:22:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=836024f4
dev-db/soci: removed shared flag, c++11 default on
Signed-off-by: Jan-Espen Oversand <sigsegv <AT> radiotube.org>
dev-db/soci/metadata.xml | 1 -
dev-db/soci/{soci-4.0.3-r1.ebuild => soci-4.0.3-r2.ebuild} | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-db/soci/metadata.xml b/dev-db/soci/metadata.xml
index 69b1e1d6a..92d41d279 100644
--- a/dev-db/soci/metadata.xml
+++ b/dev-db/soci/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="ubsan">Enable running with UB sanitizer</flag>
- <flag name="shared">Enable dynamic linking with shared objects</flag>
<flag name="cxx11">Enable c++11 support</flag>
</use>
<upstream>
diff --git a/dev-db/soci/soci-4.0.3-r1.ebuild b/dev-db/soci/soci-4.0.3-r2.ebuild
similarity index 87%
rename from dev-db/soci/soci-4.0.3-r1.ebuild
rename to dev-db/soci/soci-4.0.3-r2.ebuild
index 3ca7b75a7..65a578e73 100644
--- a/dev-db/soci/soci-4.0.3-r1.ebuild
+++ b/dev-db/soci/soci-4.0.3-r2.ebuild
@@ -10,8 +10,7 @@ SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/downl
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="odbc sqlite oracle postgres mysql +shared +static test ubsan lto cxx11"
-REQUIRED_USE="|| ( shared static )"
+IUSE="odbc sqlite oracle postgres mysql +static test ubsan lto +cxx11"
RESTRICT="!test? ( test )"
CMAKE_SKIP_TESTS=(
@@ -39,7 +38,6 @@ DEPEND="${RDEPEND}"
src_configure() {
local mycmakeargs=(
- -DSOCI_SHARED="$(usex shared)"
-DSOCI_STATIC="$(usex static)"
-DSOCI_TESTS="$(usex test)"
-DSOCI_UBSAN="$(usex ubsan)"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-db/soci/
@ 2024-12-15 22:50 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2024-12-15 22:50 UTC (permalink / raw
To: gentoo-commits
commit: 2dba1beb6be440cf9c024e59852b65eb2b9a80d5
Author: Jan-Espen Oversand <sigsegv <AT> radiotube <DOT> org>
AuthorDate: Sun Dec 15 19:56:01 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Dec 15 19:56:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2dba1beb
dev-db/soci: rename static use, remove ubsan use
Bug: https://bugs.gentoo.org/946512
Closes: https://bugs.gentoo.org/946512
Bug: https://bugs.gentoo.org/946513
Closes: https://bugs.gentoo.org/946513
Signed-off-by: Jan-Espen Oversand <sigsegv <AT> radiotube.org>
dev-db/soci/metadata.xml | 1 -
dev-db/soci/{soci-4.0.3-r2.ebuild => soci-4.0.3-r3.ebuild} | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-db/soci/metadata.xml b/dev-db/soci/metadata.xml
index 92d41d279..e9eb83d07 100644
--- a/dev-db/soci/metadata.xml
+++ b/dev-db/soci/metadata.xml
@@ -6,7 +6,6 @@
<description>Jan-Espen Oversand</description>
</maintainer>
<use>
- <flag name="ubsan">Enable running with UB sanitizer</flag>
<flag name="cxx11">Enable c++11 support</flag>
</use>
<upstream>
diff --git a/dev-db/soci/soci-4.0.3-r2.ebuild b/dev-db/soci/soci-4.0.3-r3.ebuild
similarity index 87%
rename from dev-db/soci/soci-4.0.3-r2.ebuild
rename to dev-db/soci/soci-4.0.3-r3.ebuild
index 65a578e73..ddf4ea0c6 100644
--- a/dev-db/soci/soci-4.0.3-r2.ebuild
+++ b/dev-db/soci/soci-4.0.3-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/downl
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="odbc sqlite oracle postgres mysql +static test ubsan lto +cxx11"
+IUSE="odbc sqlite oracle postgres mysql static-libs test lto +cxx11"
RESTRICT="!test? ( test )"
CMAKE_SKIP_TESTS=(
@@ -38,9 +38,8 @@ DEPEND="${RDEPEND}"
src_configure() {
local mycmakeargs=(
- -DSOCI_STATIC="$(usex static)"
+ -DSOCI_STATIC="$(usex static-libs)"
-DSOCI_TESTS="$(usex test)"
- -DSOCI_UBSAN="$(usex ubsan)"
-DSOCI_LTO="$(usex lto)"
-DSOCI_CXX11="$(usex cxx11)"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-db/soci/
@ 2024-12-16 23:55 Julien Roy
0 siblings, 0 replies; 4+ messages in thread
From: Julien Roy @ 2024-12-16 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 573a2c21798228e6677885d08cf6b2ca4ed3de5f
Author: Jan-Espen Oversand <sigsegv <AT> radiotube <DOT> org>
AuthorDate: Mon Dec 16 07:24:44 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Dec 16 07:24:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=573a2c21
dev-db/soci: required copyright attribution
Bug: https://bugs.gentoo.org/946535
Closes: https://bugs.gentoo.org/946535
Signed-off-by: Jan-Espen Oversand <sigsegv <AT> radiotube.org>
dev-db/soci/soci-4.0.3-r3.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-db/soci/soci-4.0.3-r3.ebuild b/dev-db/soci/soci-4.0.3-r3.ebuild
index ddf4ea0c6..0a360f068 100644
--- a/dev-db/soci/soci-4.0.3-r3.ebuild
+++ b/dev-db/soci/soci-4.0.3-r3.ebuild
@@ -1,3 +1,5 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
EAPI=8
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-16 23:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-14 12:58 [gentoo-commits] repo/proj/guru:master commit in: dev-db/soci/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-12-16 23:55 Julien Roy
2024-12-15 22:50 Julien Roy
2024-12-14 11:46 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox