net/subversion/patches/301-cross-compilation-macos.patch

   1 --- a/build/ac-macros/macosx.m4
   2 +++ b/build/ac-macros/macosx.m4
   3 @@ -19,80 +19,3 @@ dnl ====================================
   4  dnl
   5  dnl  Mac OS X specific checks
   6
   7 -dnl SVN_LIB_MACHO_ITERATE
   8 -dnl Check for _dyld_image_name and _dyld_image_header availability
   9 -AC_DEFUN(SVN_LIB_MACHO_ITERATE,
  10 -[
  11 -  AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
  12 -  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
  13 -    #include <mach-o/dyld.h>
  14 -    #include <mach-o/loader.h>
  15 -  ]],[[
  16 -    const struct mach_header *header = _dyld_get_image_header(0);
  17 -    const char *name = _dyld_get_image_name(0);
  18 -    if (name && header) return 0;
  19 -    return 1;
  20 -  ]])],[
  21 -    AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
  22 -              [Is Mach-O low-level _dyld API available?])
  23 -    AC_MSG_RESULT([yes])
  24 -  ],[
  25 -    AC_MSG_RESULT([no])
  26 -  ])
  27 -])
  28 -
  29 -dnl SVN_LIB_MACOS_PLIST
  30 -dnl Assign variables for Mac OS property list support
  31 -AC_DEFUN(SVN_LIB_MACOS_PLIST,
  32 -[
  33 -  AC_MSG_CHECKING([for Mac OS property list utilities])
  34 -
  35 -  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  36 -    #include <AvailabilityMacros.h>
  37 -    #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
  38 -     || !defined(MAC_OS_X_VERSION_10_0) \
  39 -     || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
  40 -    #error ProperyList API unavailable.
  41 -    #endif
  42 -  ]],[[]])],[
  43 -    SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
  44 -    AC_SUBST(SVN_MACOS_PLIST_LIBS)
  45 -    AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
  46 -              [Is Mac OS property list API available?])
  47 -    AC_MSG_RESULT([yes])
  48 -  ],[
  49 -    AC_MSG_RESULT([no])
  50 -  ])
  51 -])
  52 -
  53 -dnl SVN_LIB_MACOS_KEYCHAIN
  54 -dnl Check configure options and assign variables related to Keychain support
  55 -
  56 -AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN,
  57 -[
  58 -  AC_ARG_ENABLE(keychain,
  59 -    AS_HELP_STRING([--disable-keychain],
  60 -    [Disable use of Mac OS KeyChain for auth credentials]),
  61 -    [enable_keychain=$enableval],[enable_keychain=yes])
  62 -
  63 -  AC_MSG_CHECKING([for Mac OS KeyChain Services])
  64 -
  65 -  if test "$enable_keychain" = "yes"; then
  66 -    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  67 -      #include <AvailabilityMacros.h>
  68 -      #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
  69 -       || !defined(MAC_OS_X_VERSION_10_2) \
  70 -       || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2)
  71 -      #error KeyChain API unavailable.
  72 -      #endif
  73 -    ]],[[]])],[
  74 -      SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices"
  75 -      AC_SUBST(SVN_MACOS_KEYCHAIN_LIBS)
  76 -      AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
  77 -      AC_MSG_RESULT([yes])
  78 -    ],[
  79 -      enable_keychain=no
  80 -      AC_MSG_RESULT([no])
  81 -    ])
  82 -  fi
  83 -])
  84 --- a/Makefile.in
  85 +++ b/Makefile.in
  86 @@ -56,8 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@
  87  SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
  88  SVN_LZ4_LIBS = @SVN_LZ4_LIBS@
  89  SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@
  90 -SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@
  91 -SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@
  92 +SVN_MACOS_PLIST_LIBS =
  93 +SVN_MACOS_KEYCHAIN_LIBS =
  94
  95  LIBS = @LIBS@
  96