<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c37b7ec1731af9949e682791ee44d10149c049e8">https://github.com/macports/macports-ports/commit/c37b7ec1731af9949e682791ee44d10149c049e8</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 c37b7ec1731 vlang: revert legacysupport changes
</span>c37b7ec1731 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c37b7ec1731af9949e682791ee44d10149c049e8
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Thu Sep 1 11:35:46 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> vlang: revert legacysupport changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Temporarily patch makefile to remove references to legacysupport
</span>---
lang/vlang/Portfile | 36 ++++----
lang/vlang/files/patch-clock-gettime.diff | 11 +++
lang/vlang/files/patch-legacysupport-makefile.diff | 96 ++++++++++++++++++++++
lang/vlang/files/patch-makefile.diff | 13 ---
4 files changed, 123 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/vlang/Portfile b/lang/vlang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 213565a38de..9ee275d2b9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/vlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/vlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,12 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.setup vlang v 0.3.1
github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,19 +48,6 @@ checksums ${main_distfile} \
</span> sha256 bd5589c4133d79e7c4b46e2ee3679e4745e4cec972337eec3598076ffe087400 \
size 1488873
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# V uses MacPorts LegacySupport natively within its Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set legacy_version 15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set legacysupport_version 1.0.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} <= ${legacy_version} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://github.com/macports/macports-legacy-support/archive:legacy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append v${legacysupport_version}${extract.suffix}:legacy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append v${legacysupport_version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4a312d6afd92d1bc5fb8863bbc18c626329a77e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f38cafc931328453ce1d2ff5fc0bc2b39207b17a5ed29623d4bee46523a961b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 54910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Optional runtime dependency to use the net.http and net.websocket modules
depends_run path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,13 +72,19 @@ patchfiles patch-boehmgc-prefix.diff \
</span> patch-freetype2-prefix.diff \
patch-openssl-prefix.diff \
patch-pkgconfig-prefix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-postgresql-prefix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-postgresql-prefix.diff
</span>
# See https://github.com/vlang/v/issues/6605
# Header file <sys/errno.h>, needed for module `sync` was not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} <= 9 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-errno-header.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use LegacySupport with the time module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-clock-gettime.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-legacysupport-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Header file <sys/errno.h>, needed for module `sync` was not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= 9 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-errno-header.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,9 +100,8 @@ post-patch {
</span> reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" vlib/${f}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} <= ${legacy_version} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/thirdparty/legacy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/macports-legacy-support-${legacysupport_version} ${worksrcpath}/thirdparty/legacy/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/vlib/time/time_nix.c.v
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/vlang/files/patch-clock-gettime.diff b/lang/vlang/files/patch-clock-gettime.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d2c914d0c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/vlang/files/patch-clock-gettime.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vlib/time/time_nix.c.v.original 2022-09-01 11:28:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vlib/time/time_nix.c.v 2022-09-01 11:29:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // that can be found in the LICENSE file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#flag darwin -I@VEXEROOT/thirdparty/legacy/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#flag -I@PREFIX@/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/vlang/files/patch-legacysupport-makefile.diff b/lang/vlang/files/patch-legacysupport-makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5647444ae87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/vlang/files/patch-legacysupport-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,96 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GNUmakefile.original 2022-09-01 10:31:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GNUmakefile 2022-09-01 11:25:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,12 +7,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VEXE ?= ./v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VCREPO ?= https://github.com/vlang/vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCCREPO ?= https://github.com/vlang/tccbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LEGACYREPO ?= https://github.com/macports/macports-legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VCFILE := v.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TMPTCC := $(VROOT)/thirdparty/tcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LEGACYLIBS := $(VROOT)/thirdparty/legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMPLEGACY := $(LEGACYLIBS)/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCCOS := unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCCARCH := unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GITCLEANPULL := git clean -xf && git pull --quiet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,9 +36,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(_SYS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAC := 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCCOS := macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(shell expr $(shell uname -r | cut -d. -f1) \<= 15), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LEGACY := 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</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;'>+ ifeq ($(_SYS),FreeBSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,13 +79,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</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;'>+-.PHONY: all clean check fresh_vc fresh_tcc fresh_legacy check_for_working_tcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: all clean check fresh_vc fresh_tcc check_for_working_tcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef prod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VFLAGS+=-prod
</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;'>+-all: latest_vc latest_tcc latest_legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: latest_vc latest_tcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -std=c99 -municode -w -o v1.exe $(VC)/$(VCFILE) $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,12 +93,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ del v1.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ del v2.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef LEGACY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C $(TMPLEGACY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C $(TMPLEGACY) PREFIX=$(realpath $(LEGACYLIBS)) CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf $(TMPLEGACY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(eval override LDFLAGS+=-L$(realpath $(LEGACYLIBS))/lib -lMacportsLegacySupport)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -std=gnu99 -w -o v1.exe $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./v2.exe -o $(VEXE) $(VFLAGS) cmd/v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,7 +104,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf $(TMPTCC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf $(LEGACYLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf $(VC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifndef local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,33 +148,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @$(MAKE) --quiet check_for_working_tcc 2> /dev/null
</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;'>+-ifndef local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-latest_legacy: $(TMPLEGACY)/.git/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef LEGACY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd $(TMPLEGACY) && $(GITCLEANPULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-latest_legacy:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef LEGACY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo "Using local legacysupport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</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;'>+-fresh_legacy:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf $(LEGACYLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GITFASTCLONE) $(LEGACYREPO) $(TMPLEGACY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TMPTCC)/.git/config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) fresh_tcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(VC)/.git/config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) fresh_vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(TMPLEGACY)/.git/config:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef LEGACY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) fresh_legacy
</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;'>+ asan:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) all CFLAGS='-fsanitize=address,undefined'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/vlang/files/patch-makefile.diff b/lang/vlang/files/patch-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa967b23d28..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/vlang/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS and LDFLAGS aren't properly formatted for the makefile, resulting in "invalid option" errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.original 2022-09-01 10:31:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile 2022-09-01 10:45:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef LEGACY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) -C $(TMPLEGACY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) -C $(TMPLEGACY) PREFIX=$(realpath $(LEGACYLIBS)) CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) -C $(TMPLEGACY) PREFIX=$(realpath $(LEGACYLIBS)) install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf $(TMPLEGACY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(eval override LDFLAGS+=-L$(realpath $(LEGACYLIBS))/lib -lMacportsLegacySupport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span></pre><pre style='margin:0'>
</pre>