Author: hartmannathan
Date: Thu Mar 31 13:42:04 2022
New Revision: 1899432
URL: http://svn.apache.org/viewvc?rev=1899432&view=rev
Log:
Merge the 1.14.x-r1881534-no-crlf branch:
* r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:
Unblocks cross-compiling SVN.
Notes:
Replacement for veto-blocked r1881534 group (see below) without the
inconsistent line endings that instigated said veto blockage.
Branch:
1.14.x-r1881534-no-crlf
Votes:
+1: hartmannathan, stsp, markphip
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build/ac-macros/macosx.m4
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1881534
Merged /subversion/branches/1.14.x-r1881534-no-crlf:r1885959-1899431
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899432&r1=1899431&r2=1899432&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Mar 31 13:42:04 2022
@@ -52,18 +52,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1881534
- Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
- Justification:
- Unblocks cross-compiling SVN.
- Notes:
- Replacement for veto-blocked r1881534 group (see below) without the
- inconsistent line endings that instigated said veto blockage.
- Branch:
- 1.14.x-r1881534-no-crlf
- Votes:
- +1: hartmannathan, stsp, markphip
-
* r1896609
Bumps copyright date to 2022
Justification:
Modified: subversion/branches/1.14.x/build/ac-macros/macosx.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/ac-macros/macosx.m4?rev=1899432&r1=1899431&r2=1899432&view=diff
==============================================================================
--- subversion/branches/1.14.x/build/ac-macros/macosx.m4 (original)
+++ subversion/branches/1.14.x/build/ac-macros/macosx.m4 Thu Mar 31 13:42:04
2022
@@ -23,22 +23,25 @@ dnl SVN_LIB_MACHO_ITERATE
dnl Check for _dyld_image_name and _dyld_image_header availability
AC_DEFUN(SVN_LIB_MACHO_ITERATE,
[
- AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include <mach-o/dyld.h>
- #include <mach-o/loader.h>
- ]],[[
- const struct mach_header *header = _dyld_get_image_header(0);
- const char *name = _dyld_get_image_name(0);
- if (name && header) return 0;
- return 1;
- ]])],[
+ AC_CACHE_CHECK([for Mach-O dynamic module iteration functions],
+ [ac_cv_mach_o_dynamic_module_iteration_works], [
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+ #include <mach-o/dyld.h>
+ #include <mach-o/loader.h>
+ ]],[[
+ const struct mach_header *header = _dyld_get_image_header(0);
+ const char *name = _dyld_get_image_name(0);
+ if (name && header) return 0;
+ return 1;
+ ]])],
+ [ac_cv_mach_o_dynamic_module_iteration_works=yes],
+ [ac_cv_mach_o_dynamic_module_iteration_works=no],
+ [ac_cv_mach_o_dynamic_module_iteration_works=no])
+ ])
+ if test "$ac_cv_mach_o_dynamic_module_iteration_works" = yes; then
AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
[Is Mach-O low-level _dyld API available?])
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- ])
+ fi
])
dnl SVN_LIB_MACOS_PLIST
