blob: 8d2d635992c55252aebe6e7d65b36b600144c16f [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 15:21:46 +0800
4Subject: [PATCH] These tests don't work in cross compiling, just disable them
5 for now, we don't build subversion on OS-X at this time.
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006
7RP 1014/7/16
8
9Upstream-Status: Pending [needs a rewrite to support a cache value]
10
Brad Bishopc342db32019-05-15 21:57:59 -040011Rebase to 1.12.0
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 build/ac-macros/macosx.m4 | 31 +------------------------------
16 1 file changed, 1 insertion(+), 30 deletions(-)
17
18diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4
19index 92fa58e..a568e1c 100644
20--- a/build/ac-macros/macosx.m4
21+++ b/build/ac-macros/macosx.m4
22@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability
Patrick Williamsc124f4f2015-09-15 14:41:29 -050023 AC_DEFUN(SVN_LIB_MACHO_ITERATE,
24 [
25 AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
26- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
27- #include <mach-o/dyld.h>
28- #include <mach-o/loader.h>
29- ]],[[
30- const struct mach_header *header = _dyld_get_image_header(0);
31- const char *name = _dyld_get_image_name(0);
32- if (name && header) return 0;
33- return 1;
34- ]])],[
35- AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
36- [Is Mach-O low-level _dyld API available?])
37- AC_MSG_RESULT([yes])
38- ],[
39 AC_MSG_RESULT([no])
40- ])
41 ])
42
43 dnl SVN_LIB_MACOS_PLIST
Brad Bishopc342db32019-05-15 21:57:59 -040044@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support
Patrick Williamsc124f4f2015-09-15 14:41:29 -050045 AC_DEFUN(SVN_LIB_MACOS_PLIST,
46 [
47 AC_MSG_CHECKING([for Mac OS property list utilities])
48-
49- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
50- #include <AvailabilityMacros.h>
51- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
52- || !defined(MAC_OS_X_VERSION_10_0) \
53- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
54- #error ProperyList API unavailable.
55- #endif
56- ]],[[]])],[
Brad Bishopc342db32019-05-15 21:57:59 -040057- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
58- AC_SUBST(SVN_MACOS_PLIST_LIBS)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050059- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
60- [Is Mac OS property list API available?])
61- AC_MSG_RESULT([yes])
62- ],[
Brad Bishopc342db32019-05-15 21:57:59 -040063+ AC_SUBST([SVN_MACOS_PLIST_LIBS], [""])
Patrick Williamsc124f4f2015-09-15 14:41:29 -050064 AC_MSG_RESULT([no])
65- ])
66 ])
67
68 dnl SVN_LIB_MACOS_KEYCHAIN
Brad Bishopc342db32019-05-15 21:57:59 -040069--
702.7.4
71