From edd69375ddcbb332c5a64058d01fb7660ee24d3f Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 23 Jul 2015 15:21:05 -0700 Subject: [PATCH] dev-vcs/subversion: Apply CoreOS changes Remove problematic MacOS tests from configure.ac. --- .../dev-vcs/subversion/subversion-1.9.7.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild index f3c2697e04..93644b31be 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" COMMON_DEPEND=" @@ -149,6 +149,13 @@ src_prepare() { sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ die "/bin/sh is not POSIX shell!" + # Avoid AC_RUN_IFELSE in MacOS tests. + sed -i \ + -e "s/SVN_LIB_MACHO_ITERATE//g" \ + -e "s/SVN_LIB_MACOS_PLIST//g" \ + -e "s/SVN_LIB_MACOS_KEYCHAIN//g" \ + configure.ac + eautoconf elibtoolize