| 1 |
grobian 14/01/22 19:47:03 |
| 2 |
|
| 3 |
Modified: subversion-1.8.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Finally fix compilation of swig-python module on Darwin |
| 6 |
|
| 7 |
(Portage version: 2.2.8-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 dev-vcs/subversion/subversion-1.8.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: subversion-1.8.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- subversion-1.8.5.ebuild 16 Jan 2014 19:30:06 -0000 1.4 |
| 23 |
+++ subversion-1.8.5.ebuild 22 Jan 2014 19:47:03 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.4 2014/01/16 19:30:06 grobian Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.5 2014/01/22 19:47:03 grobian Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 32 |
@@ -128,23 +128,6 @@ |
| 33 |
sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ |
| 34 |
die "/bin/sh is not POSIX shell!" |
| 35 |
|
| 36 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 37 |
- # replace provided script that tries too hard to do a framework |
| 38 |
- # build, ending up with host-provided Python |
| 39 |
- cat > build/get-py-info.py << EOS |
| 40 |
-import sys |
| 41 |
-import sysconfig |
| 42 |
-if '--compile' in sys.argv: |
| 43 |
- print('${CHOST}-gcc') |
| 44 |
- |
| 45 |
-if '--libs' in sys.argv or '--link' in sys.argv: |
| 46 |
- libs = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split() |
| 47 |
- libs.append('-lpython' + sysconfig.get_config_var('VERSION')) |
| 48 |
- print(' '.join(libs)) |
| 49 |
-EOS |
| 50 |
- fperms +x build/get-py-info.py |
| 51 |
- fi |
| 52 |
- |
| 53 |
eautoconf |
| 54 |
elibtoolize |
| 55 |
|
| 56 |
@@ -152,6 +135,13 @@ |
| 57 |
-i build-outputs.mk || die "sed failed" |
| 58 |
|
| 59 |
if use python; then |
| 60 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 61 |
+ # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@××××××.local2%3E |
| 62 |
+ # in short, we don't have gnome-keyring stuff here, patch |
| 63 |
+ # borrowed from MacPorts |
| 64 |
+ epatch "${FILESDIR}"/${P}-swig-python-no-gnome-keyring.patch |
| 65 |
+ fi |
| 66 |
+ |
| 67 |
# XXX: make python_copy_sources accept path |
| 68 |
S=${S}/subversion/bindings/swig/python python_copy_sources |
| 69 |
rm -r "${S}"/subversion/bindings/swig/python || die |
| 70 |
@@ -208,6 +198,12 @@ |
| 71 |
python_export_best |
| 72 |
fi |
| 73 |
|
| 74 |
+ if use python && [[ ${CHOST} == *-darwin* ]] ; then |
| 75 |
+ export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' |
| 76 |
+ export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' |
| 77 |
+ export ac_cv_python_compile="$(tc-getCC)" |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
#force ruby-1.8 for bug 399105 |
| 81 |
#allow overriding Python include directory |
| 82 |
ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \ |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.162 dev-vcs/subversion/ChangeLog |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.162&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.162&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.161&r2=1.162 |
| 91 |
|
| 92 |
Index: ChangeLog |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v |
| 95 |
retrieving revision 1.161 |
| 96 |
retrieving revision 1.162 |
| 97 |
diff -u -r1.161 -r1.162 |
| 98 |
--- ChangeLog 18 Jan 2014 09:29:07 -0000 1.161 |
| 99 |
+++ ChangeLog 22 Jan 2014 19:47:03 -0000 1.162 |
| 100 |
@@ -1,6 +1,11 @@ |
| 101 |
# ChangeLog for dev-vcs/subversion |
| 102 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.161 2014/01/18 09:29:07 vapier Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.162 2014/01/22 19:47:03 grobian Exp $ |
| 105 |
+ |
| 106 |
+ 22 Jan 2014; Fabian Groffen <grobian@g.o> |
| 107 |
+ +files/subversion-1.8.5-swig-python-no-gnome-keyring.patch, |
| 108 |
+ subversion-1.8.5.ebuild: |
| 109 |
+ Finally fix compilation of swig-python module on Darwin |
| 110 |
|
| 111 |
18 Jan 2014; Mike Frysinger <vapier@g.o> subversion-1.7.14.ebuild: |
| 112 |
Mark s390/sh stable. |
Archives