<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e82a6397e5a404ac157552129015b21557f57d53">https://github.com/macports/macports-base/commit/e82a6397e5a404ac157552129015b21557f57d53</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e82a6397 rev-upgrade: Use _dyld_shared_cache_contains_path() rather than dlopen_preflight() to check for hits in the shared cache
</span>e82a6397 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e82a6397e5a404ac157552129015b21557f57d53
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Aug 9 20:42:42 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> rev-upgrade: Use _dyld_shared_cache_contains_path() rather than dlopen_preflight() to check for hits in the shared cache
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is available as API as of the macOS 11 Beta 4 SDK.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
configure | 2 +-
configure.ac | 2 +-
src/config.h.in | 4 ++--
src/machista1.0/libmachista.c | 9 ++++-----
4 files changed, 8 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index 16c22954..b431800f 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6860,7 +6860,7 @@ done
</span> # Checks for library functions.
for ac_func in OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 \
OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dlopen_preflight flock fls kqueue posix_spawn setmode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _dyld_shared_cache_contains_path flock fls kqueue posix_spawn setmode \
</span> sysctlbyname
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index 6471247c..e6a15358 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,7 +248,7 @@ AC_CHECK_HEADERS([crt_externs.h err.h fcntl.h libkern/OSAtomic.h libproc.h limit
</span> # Checks for library functions.
AC_CHECK_FUNCS([OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 \
OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dlopen_preflight flock fls kqueue posix_spawn setmode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _dyld_shared_cache_contains_path flock fls kqueue posix_spawn setmode \
</span> sysctlbyname])
# Check for library functions, replacements are in pextlib1.0/compat/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/config.h.in b/src/config.h.in
</span><span style='display:block; white-space:pre;color:#808080;'>index ba963982..a854a6e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/config.h.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/config.h.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,8 @@
</span> and to 0 if you don't. */
#undef HAVE_DECL_USERNAME_COMPLETION_FUNCTION
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Define to 1 if you have the `dlopen_preflight' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#undef HAVE_DLOPEN_PREFLIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/* Define to 1 if you have the `_dyld_shared_cache_contains_path' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#undef HAVE__DYLD_SHARED_CACHE_CONTAINS_PATH
</span>
/* Define to 1 if you have the <err.h> header file. */
#undef HAVE_ERR_H
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/libmachista.c b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e06debe0..a4753e7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,12 +52,11 @@
</span> #include <strings.h>
#ifdef __MACH__
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <mach-o/dyld.h>
</span> #include <mach-o/fat.h>
#include <mach-o/loader.h>
#include <libkern/OSByteOrder.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <dlfcn.h>
</span> #endif
#include "libmachista.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -467,11 +466,11 @@ int macho_parse_file(macho_handle_t *handle, const char *filepath, const macho_t
</span>
/* Open input file */
if ((fd = open(filepath, O_RDONLY)) < 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef HAVE_DLOPEN_PREFLIGHT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dlopen_preflight(filepath)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef HAVE__DYLD_SHARED_CACHE_CONTAINS_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_dyld_shared_cache_contains_path(filepath)) {
</span> return MACHO_ECACHE;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* HAVE_DLOPEN_PREFLIGHT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif /* HAVE__DYLD_SHARED_CACHE_CONTAINS_PATH */
</span> return MACHO_EFILE;
}
</pre><pre style='margin:0'>
</pre>