From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3A71138350 for ; Fri, 31 Jan 2020 17:38:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C837E078A; Fri, 31 Jan 2020 17:38:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35AAAE078A for ; Fri, 31 Jan 2020 17:38:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 717BE34E601 for ; Fri, 31 Jan 2020 17:38:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E9857E for ; Fri, 31 Jan 2020 17:38:37 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1580492234.ffe7f6740db6aee805faebc1c61992f0c46fbc72.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.1.44.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: ffe7f6740db6aee805faebc1c61992f0c46fbc72 X-VCS-Branch: master Date: Fri, 31 Jan 2020 17:38:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54383143-be38-4663-81ae-aea8edc37d92 X-Archives-Hash: e47008d90dafc2d4926304c4cc6010d7 commit: ffe7f6740db6aee805faebc1c61992f0c46fbc72 Author: Brian Evans gentoo org> AuthorDate: Fri Jan 31 17:37:14 2020 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Jan 31 17:37:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe7f674 dev-db/mariadb: Fix fno-common error with 10.1.44 This error is not present in other versions as the affected file was transitioned to CXX correctly in 10.2+ and does not exist in 5.5 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/mariadb-10.1.44.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild index 75342265967..5e7691b1973 100644 --- a/dev-db/mariadb/mariadb-10.1.44.ebuild +++ b/dev-db/mariadb/mariadb-10.1.44.ebuild @@ -243,6 +243,9 @@ src_prepare() { sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S%/}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S%/}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die + # Fix -fno-common error + sed -i -e '/^datasink_t datasink_buffer;$/d' extra/mariabackup/xbstream.c || die + local plugin local server_plugins=( handler_socket auth_socket feedback metadata_lock_info locale_info qc_info server_audit semisync sql_errlog )