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 40B8E138247 for ; Thu, 16 Jan 2014 19:30:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDAE3E0C56; Thu, 16 Jan 2014 19:30:09 +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 5AB31E0C56 for ; Thu, 16 Jan 2014 19:30:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F9EA33F87D for ; Thu, 16 Jan 2014 19:30:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 984) id BC5BC2004C; Thu, 16 Jan 2014 19:30:06 +0000 (UTC) From: "Fabian Groffen (grobian)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, grobian@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/subversion: subversion-1.8.5.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: subversion-1.8.5.ebuild ChangeLog X-VCS-Directories: dev-vcs/subversion X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140116193006.BC5BC2004C@flycatcher.gentoo.org> Date: Thu, 16 Jan 2014 19:30:06 +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: 452026f2-4dbb-4935-862f-ccddcd7d988a X-Archives-Hash: fb2699b4f77e41f326f7e76912ec5c15 grobian 14/01/16 19:30:06 Modified: subversion-1.8.5.ebuild ChangeLog Log: Fix compilation on Solaris, help it find a proper python on Darwin (Portage version: 2.2.8-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) Revision Changes Path 1.4 dev-vcs/subversion/subversion-1.8.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?r1=1.3&r2=1.4 Index: subversion-1.8.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- subversion-1.8.5.ebuild 8 Jan 2014 09:42:20 -0000 1.3 +++ subversion-1.8.5.ebuild 16 Jan 2014 19:30:06 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.3 2014/01/08 09:42:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.4 2014/01/16 19:30:06 grobian Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -103,6 +103,9 @@ append-cppflags -DSVN_DEBUG -DAP_DEBUG fi + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ + # Allow for custom repository locations. SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" } @@ -125,6 +128,23 @@ sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ die "/bin/sh is not POSIX shell!" + if [[ ${CHOST} == *-darwin* ]] ; then + # replace provided script that tries too hard to do a framework + # build, ending up with host-provided Python + cat > build/get-py-info.py << EOS +import sys +import sysconfig +if '--compile' in sys.argv: + print('${CHOST}-gcc') + +if '--libs' in sys.argv or '--link' in sys.argv: + libs = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split() + libs.append('-lpython' + sysconfig.get_config_var('VERSION')) + print(' '.join(libs)) +EOS + fperms +x build/get-py-info.py + fi + eautoconf elibtoolize 1.160 dev-vcs/subversion/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.160&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.160&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.159&r2=1.160 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- ChangeLog 8 Jan 2014 10:09:27 -0000 1.159 +++ ChangeLog 16 Jan 2014 19:30:06 -0000 1.160 @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.159 2014/01/08 10:09:27 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.160 2014/01/16 19:30:06 grobian Exp $ + + 16 Jan 2014; Fabian Groffen subversion-1.8.5.ebuild: + Fix compilation on Solaris, help it find a proper python on Darwin 08 Jan 2014; Lars Wendler files/subversion-1.8.0-hpux-dso.patch: