<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56bf1a482dc03faffd6dc7e5b3bd3f9858851ce9">https://github.com/macports/macports-ports/commit/56bf1a482dc03faffd6dc7e5b3bd3f9858851ce9</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 56bf1a482dc julia: Patch Makefile if darwin version < 19
</span>56bf1a482dc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 56bf1a482dc03faffd6dc7e5b3bd3f9858851ce9
</span>Author: Olivier Benz <olivier.benz@b-data.ch>
AuthorDate: Wed May 31 17:53:20 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> julia: Patch Makefile if darwin version < 19
</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/65550
</span><span style='display:block; white-space:pre;color:#404040;'> - Specify minimal platform version
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove p7zip dependency
</span><span style='display:block; white-space:pre;color:#404040;'> - 7z is installed to private libexec/julia directory
</span>---
lang/julia/Portfile | 11 +++++---
lang/julia/files/patch-Makefile.diff | 54 ++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/julia/Portfile b/lang/julia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba96c7cd339..0c5590458fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/julia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/julia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,10 @@ compilers.setup require_fortran -g95
</span> compiler.blacklist-append {clang < 900}
github.setup JuliaLang julia 1.9.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories-append lang math science
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin >= 14}
</span> license MIT
homepage http://julialang.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +52,13 @@ if {[option gpg_verify.use_gpg_verification]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:p7zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # julia build is `make && make install`
# see https://github.com/JuliaLang/julia/blob/master/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.target {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +94,7 @@ post-destroot {
</span> move ${dpw}/julia-${version}/lib/libjulia.${short_version}.dylib ${destroot}${prefix}/lib
move ${dpw}/julia-${version}/lib/libjulia.dylib ${destroot}${prefix}/lib
move ${dpw}/julia-${version}/lib/libjulia.${major_version}.dylib ${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/JuliaLang/julia/pull/48931
</span> move ${dpw}/julia-${version}/libexec/julia ${destroot}${prefix}/libexec/julia
move ${dpw}/julia-${version}/share/julia ${destroot}${prefix}/share
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/julia/files/patch-Makefile.diff b/lang/julia/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6cb0a16a65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/julia/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2023-05-07 13:25:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2023-05-30 15:53:12.466160252 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,16 +149,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG_LDFLAGS := $(LLVM_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CLANG_LDFLAGS += -Wl,-undefined,dynamic_lookup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OSLIBS += $(SRCDIR)/mach_dyld_atfork.tbd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CLANG_LDFLAGS += -Wl,-undefined,dynamic_lookup -Wl,-U,__dyld_atfork_parent -Wl,-U,__dyld_atfork_prepare -Wl,-U,__dyld_dlopen_atfork_parent -Wl,-U,__dyld_dlopen_atfork_prepare -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBJULIA_PATH_REL := @rpath/libjulia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBJULIA_PATH_REL := libjulia
</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;'>+ COMMON_LIBPATHS := -L$(build_libdir) -L$(build_shlibdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-RT_LIBS := $(WHOLE_ARCHIVE) $(LIBUV) $(WHOLE_ARCHIVE) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LIBUNWIND) $(RT_LLVMLINK) $(OSLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CG_LIBS := $(LIBUNWIND) $(CG_LLVMLINK) $(OSLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++RT_LIBS := $(WHOLE_ARCHIVE) $(LIBUV) $(WHOLE_ARCHIVE) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LIBUNWIND) $(RT_LLVMLINK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CG_LIBS := $(LIBUNWIND) $(CG_LLVMLINK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RT_DEBUG_LIBS := $(COMMON_LIBPATHS) $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a -ljulia-debug $(RT_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CG_DEBUG_LIBS := $(COMMON_LIBPATHS) $(CG_LIBS) -ljulia-debug -ljulia-internal-debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RT_RELEASE_LIBS := $(COMMON_LIBPATHS) $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport.a -ljulia $(RT_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -364,13 +363,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXLD = $(CXX) -shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(CLANG_LDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JLDFLAGS) $(JLIBLDFLAGS) $(RT_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-internal.$(JL_MAJOR_SHLIB_EXT)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(INSTALL_NAME_CMD)libjulia-internal.$(SHLIB_EXT) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DSYMUTIL) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(CLANG_LDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JLDFLAGS) $(JLIBLDFLAGS) $(RT_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-internal-debug.$(JL_MAJOR_SHLIB_EXT)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(INSTALL_NAME_CMD)libjulia-internal-debug.$(SHLIB_EXT) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DSYMUTIL) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,13 +389,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libjulia-internal-debug libjulia-internal-release: $(PUBLIC_HEADER_TARGETS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(build_shlibdir)/libjulia-codegen.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(CODEGEN_OBJS) $(BUILDDIR)/support/libsupport.a $(build_shlibdir)/libjulia-internal.$(JL_MAJOR_MINOR_SHLIB_EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(CODEGEN_OBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(CLANG_LDFLAGS) $(SHIPFLAGS) $(CODEGEN_OBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JLDFLAGS) $(JLIBLDFLAGS) $(CG_RELEASE_LIBS) $(call SONAME_FLAGS,libjulia-codegen.$(JL_MAJOR_SHLIB_EXT)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(INSTALL_NAME_CMD)libjulia-codegen.$(SHLIB_EXT) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DSYMUTIL) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(build_shlibdir)/libjulia-codegen-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(CODEGEN_DOBJS) $(BUILDDIR)/support/libsupport-debug.a $(build_shlibdir)/libjulia-internal-debug.$(JL_MAJOR_MINOR_SHLIB_EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(CODEGEN_DOBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @$(call PRINT_LINK, $(CXXLD) $(call IMPLIB_FLAGS,$@) $(JCXXFLAGS) $(JL_CXXFLAGS) $(CXXLDFLAGS) $(CLANG_LDFLAGS) $(DEBUGFLAGS) $(CODEGEN_DOBJS) $(RPATH_LIB) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(JLDFLAGS) $(JLIBLDFLAGS) $(CG_DEBUG_LIBS) $(call SONAME_FLAGS,libjulia-codegen-debug.$(JL_MAJOR_SHLIB_EXT)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(INSTALL_NAME_CMD)libjulia-codegen-debug.$(SHLIB_EXT) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DSYMUTIL) $@
</span></pre><pre style='margin:0'>
</pre>