From 65e0fb41ba97571b6314d9461aa717c2aee50009 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 23 Jul 2015 15:21:05 -0700 Subject: [PATCH] dev-vcs/subversion: Fix cross compile build error Remove problematic MacOS tests from configure.ac. Bumps subversion-1.8.13-r2 to subversion-1.8.13-r3. Signed-off-by: Geoff Levand --- ...ersion-1.8.13-r2.ebuild => subversion-1.8.13-r3.ebuild} | 7 +++++++ 1 file changed, 7 insertions(+) rename sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/{subversion-1.8.13-r2.ebuild => subversion-1.8.13-r3.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild index 07ee89d39d..04dfea6dfa 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild @@ -133,6 +133,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