Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/
Date: Sat, 17 Aug 2019 20:13:42
Message-Id: 1566072808.1f7a0d904e874542e2423c2ea4e214557ba6078d.whissi@gentoo
1 commit: 1f7a0d904e874542e2423c2ea4e214557ba6078d
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 17 20:12:00 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 17 20:13:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7a0d90
7
8 dev-db/mysql-connector-c: disable rpm call
9
10 Closes: https://bugs.gentoo.org/692368
11 Package-Manager: Portage-2.3.71, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
18 index 8bde003962a..7e8007d8e35 100644
19 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
20 +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
21 @@ -37,7 +37,8 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.17-libressl.patch )
22 src_prepare() {
23 sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
24
25 - # All these are for the server only
26 + # All these are for the server only.
27 + # Disable rpm call which would trigger sandbox, #692368
28 sed -i \
29 -e '/MYSQL_CHECK_LIBEVENT/d' \
30 -e '/MYSQL_CHECK_RAPIDJSON/d' \
31 @@ -49,6 +50,7 @@ src_prepare() {
32 -e '/ADD_SUBDIRECTORY(man)/d' \
33 -e '/ADD_SUBDIRECTORY(share)/d' \
34 -e '/INCLUDE(cmake\/boost/d' \
35 + -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
36 CMakeLists.txt || die
37
38 # Skip building clients