From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 46E3A138989 for ; Fri, 1 May 2015 18:49:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A53EDE07C2; Fri, 1 May 2015 18:49:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59CD1E07C2 for ; Fri, 1 May 2015 18:49:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 347DF340DD4 for ; Fri, 1 May 2015 18:49:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C636E9AA for ; Fri, 1 May 2015 18:49:02 +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: <1430506167.7bf949f0b287b2b8a7c814705629a306d8acbcc7.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 7bf949f0b287b2b8a7c814705629a306d8acbcc7 X-VCS-Branch: master Date: Fri, 1 May 2015 18:49:02 +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-Archives-Salt: d355e598-ace7-4ee7-b211-cbd5c23f94e9 X-Archives-Hash: bf03ef2aea71981aff083fef11496a21 commit: 7bf949f0b287b2b8a7c814705629a306d8acbcc7 Author: layman localhost> AuthorDate: Fri May 1 18:49:27 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri May 1 18:49:27 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7bf949f0 Fix multilib builds wrt libbfd eclass/mysql-multilib.eclass | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index e6432f7..4b379f9 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -569,11 +569,18 @@ multilib_src_configure() { fi if in_iuse bindist ; then - mycmakeargs+=( - -DWITH_READLINE=$(usex bindist 1 0) - -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - $(usex bindist -DHAVE_BFD_H=0 '') - ) + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + if multilib_is_native_abi; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + ) + else + mycmakeargs+=( + -DWITH_READLINE=1 + -DNOT_FOR_DISTRIBUTION=0 + ) + fi fi ### TODO: make this system but issues with UTF-8 prevent it