diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch')
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch b/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch new file mode 100644 index 0000000000..ec3be496f3 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | These tests don't work in cross compiling, just disable them for now, we don't | ||
| 2 | build subversion on OS-X at this time. | ||
| 3 | |||
| 4 | RP 1014/7/16 | ||
| 5 | |||
| 6 | Upstream-Status: Pending [needs a rewrite to support a cache value] | ||
| 7 | |||
| 8 | Index: subversion-1.8.9/build/ac-macros/macosx.m4 | ||
| 9 | =================================================================== | ||
| 10 | --- subversion-1.8.9.orig/build/ac-macros/macosx.m4 2012-11-26 03:04:27.000000000 +0000 | ||
| 11 | +++ subversion-1.8.9/build/ac-macros/macosx.m4 2014-07-16 12:28:58.357300403 +0000 | ||
| 12 | @@ -24,21 +24,7 @@ | ||
| 13 | AC_DEFUN(SVN_LIB_MACHO_ITERATE, | ||
| 14 | [ | ||
| 15 | AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) | ||
| 16 | - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ | ||
| 17 | - #include <mach-o/dyld.h> | ||
| 18 | - #include <mach-o/loader.h> | ||
| 19 | - ]],[[ | ||
| 20 | - const struct mach_header *header = _dyld_get_image_header(0); | ||
| 21 | - const char *name = _dyld_get_image_name(0); | ||
| 22 | - if (name && header) return 0; | ||
| 23 | - return 1; | ||
| 24 | - ]])],[ | ||
| 25 | - AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], | ||
| 26 | - [Is Mach-O low-level _dyld API available?]) | ||
| 27 | - AC_MSG_RESULT([yes]) | ||
| 28 | - ],[ | ||
| 29 | AC_MSG_RESULT([no]) | ||
| 30 | - ]) | ||
| 31 | ]) | ||
| 32 | |||
| 33 | dnl SVN_LIB_MACOS_PLIST | ||
| 34 | @@ -46,34 +32,7 @@ | ||
| 35 | AC_DEFUN(SVN_LIB_MACOS_PLIST, | ||
| 36 | [ | ||
| 37 | AC_MSG_CHECKING([for Mac OS property list utilities]) | ||
| 38 | - | ||
| 39 | - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
| 40 | - #include <AvailabilityMacros.h> | ||
| 41 | - #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ | ||
| 42 | - || !defined(MAC_OS_X_VERSION_10_0) \ | ||
| 43 | - || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) | ||
| 44 | - #error ProperyList API unavailable. | ||
| 45 | - #endif | ||
| 46 | - ]],[[]])],[ | ||
| 47 | - dnl ### Hack. We should only need to pass the -framework options when | ||
| 48 | - dnl linking libsvn_subr, since it is the only library that uses Keychain. | ||
| 49 | - dnl | ||
| 50 | - dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for | ||
| 51 | - dnl OS X frameworks like it does for normal libraries, so we need to | ||
| 52 | - dnl explicitly pass the option to all the users of libsvn_subr to allow | ||
| 53 | - dnl static builds to link successfully. | ||
| 54 | - dnl | ||
| 55 | - dnl This does mean that all executables we link will be linked directly | ||
| 56 | - dnl to these frameworks - even when building shared libraries - but that | ||
| 57 | - dnl shouldn't cause any problems. | ||
| 58 | - | ||
| 59 | - LIBS="$LIBS -framework CoreFoundation" | ||
| 60 | - AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], | ||
| 61 | - [Is Mac OS property list API available?]) | ||
| 62 | - AC_MSG_RESULT([yes]) | ||
| 63 | - ],[ | ||
| 64 | AC_MSG_RESULT([no]) | ||
| 65 | - ]) | ||
| 66 | ]) | ||
| 67 | |||
| 68 | dnl SVN_LIB_MACOS_KEYCHAIN | ||