Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/
Date: Fri, 02 Mar 2018 02:10:42
Message-Id: 1519956627.91946ca7a026ddd54f23d14f9954219e4898c386.grknight@gentoo
1 commit: 91946ca7a026ddd54f23d14f9954219e4898c386
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 02:09:47 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 02:10:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91946ca7
7
8 dev-db/mariadb-connector-c: Ban gold linker, it fails to compile
9
10 Closes: https://bugs.gentoo.org/649312
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
17 index 1f264a5fc62..f4094ff2f15 100644
18 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
19 +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
20 @@ -16,7 +16,7 @@ else
21 KEYWORDS="~amd64 ~x86"
22 fi
23
24 -inherit cmake-utils multilib-minimal ${VCS_INHERIT}
25 +inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
26
27 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
28
29 @@ -72,6 +72,12 @@ src_prepare() {
30 cmake-utils_src_prepare
31 }
32
33 +src_configure() {
34 + # bug 508724 mariadb cannot use ld.gold
35 + tc-ld-disable-gold
36 + multilib-minimal_src_configure
37 +}
38 +
39 multilib_src_configure() {
40 local mycmakeargs=(
41 -DWITH_EXTERNAL_ZLIB=ON