diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-04-26 16:52:27 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-04-26 16:55:52 +0200 |
| commit | 6d5db58628c43216250f1d67de7d9c91aef13847 (patch) | |
| tree | 713ec5af5a69ef5345dbb0cde714b3bcd2518967 | |
| parent | sci-geosciences/routino: bump to 3.3.3 (diff) | |
| download | gentoo-6d5db58628c43216250f1d67de7d9c91aef13847.tar.gz gentoo-6d5db58628c43216250f1d67de7d9c91aef13847.tar.bz2 gentoo-6d5db58628c43216250f1d67de7d9c91aef13847.zip | |
dev-db/myodbc: don't static link mysqlclient anymore
Closes: https://bugs.gentoo.org/769299
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | dev-db/myodbc/myodbc-8.0.24-r1.ebuild (renamed from dev-db/myodbc/myodbc-8.0.24.ebuild) | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/dev-db/myodbc/myodbc-8.0.24.ebuild b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild index aca18615d239..888d9f95fe16 100644 --- a/dev-db/myodbc/myodbc-8.0.24.ebuild +++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild @@ -18,10 +18,9 @@ SLOT="${MAJOR}" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -# Broken when built dynamically against libmysqlclient.so RDEPEND=" dev-db/unixODBC[${MULTILIB_USEDEP}] - >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}] + >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}] " DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -44,19 +43,27 @@ src_prepare() { } multilib_src_configure() { + CMAKE_BUILD_TYPE="RelWithDebInfo" + mycmakeargs+=( - -DMYSQLCLIENT_STATIC_LINKING=1 - -DMYSQL_CXX_LINKAGE=1 - -DWITH_UNIXODBC=1 + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DMYSQLCLIENT_STATIC_LINKING=OFF + -DMYSQL_CXX_LINKAGE=YES + -DWITH_UNIXODBC=YES -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF} -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" -DMYSQLCLIENT_NO_THREADS=ON -DDISABLE_GUI=ON + # Don't build "libmysql_strings.so" and "libmysql_sys.so" which are only + # used internally + -DBUILD_SHARED_LIBS=OFF # The NUMA and LIBWRAP options are not really used. # They are just copied from the server code -DWITH_NUMA=OFF -DWITH_LIBWRAP=OFF ) + cmake-utils_src_configure } |