Fix configure on Darwin by using our own provided python-config iso gdb-provided copy

(Portage version: 2.2.01.22288-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

3 files changed, 30 insertions, 3 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index e9271e4be634..65a27cfefb35 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.244 2013/09/03 02:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.245 2013/09/15 12:04:52 grobian Exp $
+
+  15 Sep 2013; Fabian Groffen <grobian@gentoo.org> gdb-7.6.1.ebuild,
+  gdb-9999.ebuild:
+  Fix configure on Darwin by using our own provided python-config iso gdb-
+  provided copy
 
 *gdb-7.6.1 (03 Sep 2013)
 
diff --git a/sys-devel/gdb/gdb-7.6.1.ebuild b/sys-devel/gdb/gdb-7.6.1.ebuild
index 0ad552738f9e..0dc662dee8d0 100644
--- a/sys-devel/gdb/gdb-7.6.1.ebuild
+++ b/sys-devel/gdb/gdb-7.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.1.ebuild,v 1.1 2013/09/03 02:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.6.1.ebuild,v 1.2 2013/09/15 12:04:52 grobian Exp $
 
 EAPI="3"
 
@@ -72,6 +72,17 @@ src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	strip-linguas -u bfd/po opcodes/po
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# make sure we have a python-config that matches our install,
+		# such that the python check doesn't fail just because the
+		# gdb-provided copy isn't quite what our python installed
+		# version is
+		rm -f "${S}"/gdb/python/python-config.py || die
+		pushd "${S}"/gdb/python > /dev/null || die
+		ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \
+			python-config.py || die
+		popd > /dev/null || die
+	fi
 }
 
 gdb_branding() {
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 3f00824c0dc6..ce86c86bfaa3 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.13 2013/02/21 03:21:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.14 2013/09/15 12:04:52 grobian Exp $
 
 EAPI="3"
 
@@ -72,6 +72,17 @@ src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	strip-linguas -u bfd/po opcodes/po
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# make sure we have a python-config that matches our install,
+		# such that the python check doesn't fail just because the
+		# gdb-provided copy isn't quite what our python installed
+		# version is
+		rm -f "${S}"/gdb/python/python-config.py || die
+		pushd "${S}"/gdb/python > /dev/null || die
+		ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \
+			python-config.py || die
+		popd > /dev/null || die
+	fi
 }
 
 gdb_branding() {