<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6ca637b6f51d189bffde315bb2732840ec2b115">https://github.com/macports/macports-ports/commit/b6ca637b6f51d189bffde315bb2732840ec2b115</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 b6ca637b6f5 phyfs: fix build with gcc compilers
</span>b6ca637b6f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6ca637b6f51d189bffde315bb2732840ec2b115
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Jun 21 12:32:48 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> phyfs: fix build with gcc compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> work around no @autoreleasepool support in gcc
</span><span style='display:block; white-space:pre;color:#404040;'> fix an error in the CMakeLists.txt when using gcc on macOS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58645
</span>---
devel/physfs/Portfile | 13 ++++++
.../physfs/files/patch-physfs-autoreleasepool.diff | 52 ++++++++++++++++++++++
...makelists-dont-force-skip-runpath-with-gcc.diff | 22 +++++++++
3 files changed, 87 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/physfs/Portfile b/devel/physfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da4f4563bf5..2b86e47ac55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/physfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/physfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,19 @@ depends_lib-append port:zlib \
</span> port:readline \
port:ncurses
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# these patches could be always applied, but tuck them in a "gcc" only block
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to minimize any chances of unforseen complications with current MacPorts builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.cc}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow build with gcc compilers that don't understand @autoreleasepool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-physfs-autoreleasepool.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmakelists was setting CMAKE_SKIP_RPATH when using gcc, which has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the ultimate effect of installing the library without any path component
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in the install name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-physfs-cmakelists-dont-force-skip-runpath-with-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]LATEST_VERSION.html
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/physfs/files/patch-physfs-autoreleasepool.diff b/devel/physfs/files/patch-physfs-autoreleasepool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f9bf0aaacbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/physfs/files/patch-physfs-autoreleasepool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/physfs_platform_apple.m.orig src/physfs_platform_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e6207f5..c3af928 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/physfs_platform_apple.m.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/physfs_platform_apple.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,12 @@ void __PHYSFS_platformDeinit(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @autoreleasepool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *path = [[NSBundle mainBundle] bundlePath];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BAIL_IF(!path, PHYSFS_ERR_OS_ERROR, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t len = [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,14 +44,22 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retval[len] = '/';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retval[len+1] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval; /* whew. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* @autoreleasepool */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [pool release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* __PHYSFS_platformCalcBaseDir */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @autoreleasepool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BAIL_IF(!paths, PHYSFS_ERR_OS_ERROR, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *path = (NSString *) [paths objectAtIndex:0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +71,11 @@ char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [path getCString:retval maxLength:len+1 encoding:NSUTF8StringEncoding];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(retval + len, applen + 3, "/%s/", app);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval; /* whew. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* @autoreleasepool */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [pool release];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } /* __PHYSFS_platformCalcPrefDir */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/physfs/files/patch-physfs-cmakelists-dont-force-skip-runpath-with-gcc.diff b/devel/physfs/files/patch-physfs-cmakelists-dont-force-skip-runpath-with-gcc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a4884fc6062
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/physfs/files/patch-physfs-cmakelists-dont-force-skip-runpath-with-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-06-21 11:31:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-06-21 11:42:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,11 +29,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_COMPILER_IS_GNUCC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Don't use -rpath.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-xldscope=hidden)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +166,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(PHYSFS_BUILD_SHARED "Build shared library" TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PHYSFS_BUILD_SHARED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(physfs SHARED ${PHYSFS_SRCS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(physfs PROPERTIES MACOSX_RPATH 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(physfs PROPERTIES VERSION ${PHYSFS_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WINRT)
</span></pre><pre style='margin:0'>
</pre>