summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-07-02 23:20:22 +0200
committerDavid Seifert <soap@gentoo.org>2022-07-02 23:20:22 +0200
commit2770aa8433053443ce07a50cd08aa2edda6dc4f7 (patch)
tree267790d3f5fd0343d6a3cc56b034eefab570e735 /dev-db
parentdev-perl/HTML-Mason: Stabilize 1.590.0-r1 amd64, #855917 (diff)
downloadgentoo-2770aa8433053443ce07a50cd08aa2edda6dc4f7.tar.gz
gentoo-2770aa8433053443ce07a50cd08aa2edda6dc4f7.tar.bz2
gentoo-2770aa8433053443ce07a50cd08aa2edda6dc4f7.zip
dev-db/mysql-connector-c++: update EAPI 7 -> 8
Closes: https://bugs.gentoo.org/834439 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild (renamed from dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild)34
1 files changed, 13 insertions, 21 deletions
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild
index 889a975cea72..e4f89b29bcd2 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild
@@ -1,21 +1,21 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C++/${P}.tar.gz"
LICENSE="Artistic GPL-2"
SLOT="0/7"
KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86"
-IUSE="debug examples gcov static-libs"
+IUSE="debug examples gcov"
-DEPEND="dev-db/mysql-connector-c:=
+DEPEND="
+ dev-db/mysql-connector-c:=
dev-libs/boost:=
dev-libs/openssl:0=
!<dev-db/mysql-connector-c-6.1.8"
@@ -28,31 +28,23 @@ PATCHES=(
src_configure() {
# native lib/wrapper needs this!
- append-flags "-fno-strict-aliasing"
+ append-flags -fno-strict-aliasing
local mycmakeargs=(
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
-DMYSQLCPPCONN_ICU_ENABLE=OFF
- -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
- -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
- -DINSTALL_DOCS="/usr/share/doc/${PF}"
+ -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug)
+ -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov)
+ -DINSTALL_DOCS="share/doc/${PF}"
-DMYSQL_CXX_LINKAGE=0
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
)
-
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
-
- # static lib has wrong name so we need to rename it
- if use static-libs; then
- mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
- "${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
- else
- rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
- fi
+ cmake_src_install
+ rm "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a || die
# examples
if use examples; then