<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/cb50057b0af7afd74f61b687164341256cd24147">https://github.com/macports/macports-ports/commit/cb50057b0af7afd74f61b687164341256cd24147</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 cb50057b0af vlang: Remove tmp directory patch
</span>cb50057b0af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cb50057b0af7afd74f61b687164341256cd24147
</span>Author: harens <12570877+harens@users.noreply.github.com>
AuthorDate: Thu Mar 31 13:17:35 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> vlang: Remove tmp directory patch
</span>---
lang/vlang/Portfile | 26 +++++---------------------
lang/vlang/files/patch-tmp-location.diff | 20 --------------------
2 files changed, 5 insertions(+), 41 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 450a8ade18b..322c2430b12 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;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
# clock_gettime
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,6 @@ license MIT
</span> categories lang
maintainers {harens @harens} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix location of temporary directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-tmp-location.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Install the V compiler as a separate distfile.
# Based on https://github.com/macports/macports-ports/blob/master/games/minetest/Portfile
set vc_commit de63146da0a0f93628f8a65e70267e2c8d4c7ce1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,20 +48,13 @@ checksums ${main_distfile} \
</span> compiler.c_standard 2011
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build process based on https://github.com/vlang/v/blob/master/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {
</span> # Disable vlang self update feature.
set updating_path ${worksrcpath}/cmd/tools
copy -force ${filespath}/vup.v ${worksrcpath}/cmd/tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Patch tmp directory, which is required during buildtime and runtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@WORKPATH@@|${workpath}|g" ${worksrcpath}/vlib/v/util/util.v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/vlib/v/util/util.v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Build process based on https://github.com/vlang/v/blob/master/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set custom cflags since `-I/opt/local/include/LegacySupport` isn't recognised
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set VFLAGS "-cc ${configure.cc} -cflags -Os"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set VFLAGS "-v -prod -cc ${configure.cc} -cflags [shellescape ${configure.cflags}]"
</span>
system -W ${worksrcpath} "${configure.cc} ${configure.cflags} -I ./thirdparty/stdatomic/nix -o v1 ../vc-${vc_commit}/v.c -lm -lpthread ${configure.ldflags}"
system -W ${worksrcpath} "./v1 -no-parallel -o v2 ${VFLAGS} cmd/v"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,18 +85,12 @@ destroot {
</span> fs-traverse item ${library_path} {
file attributes ${item} -group _developer -permissions g+w
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Manually create a tmp directory, and set writable permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://github.com/vlang/v/issues/7713 and https://github.com/vlang/v/discussions/11796
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set tmp_dir ${prefix}/var/run/vlang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${tmp_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${tmp_dir} -group _developer -permissions g+w
</span> }
# Based on various Android ports - don't make files world-writable.
# e.g. https://github.com/macports/macports-ports/blob/master/java/android/Portfile
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-The Vlang library and cache directories are group _developer writable. You need to be a member of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The Vlang library directory is group _developer writable. You need to be a member of the
</span> _developer group to use Vlang. If you are not, run:
sudo dscl . append /Groups/_developer GroupMembership <username>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/vlang/files/patch-tmp-location.diff b/lang/vlang/files/patch-tmp-location.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7ab250b3b2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/vlang/files/patch-tmp-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vlib/v/util/util.v.original 2022-03-30 13:33:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vlib/v/util/util.v 2022-03-30 13:33:33.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -467,14 +467,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pub fn get_vtmp_folder() string {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mut vtmp := os.getenv('VTMP')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if vtmp.len > 0 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return vtmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uid := os.getuid()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vtmp = os.join_path_single(os.temp_dir(), 'v_$uid')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if !os.exists(vtmp) || !os.is_dir(vtmp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.mkdir_all(vtmp) or { panic(err) }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mut vtmp := '@@WORKPATH@@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if !os.exists(vtmp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtmp = '@@PREFIX@@/var/run/vlang'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.setenv('VTMP', vtmp, true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return vtmp
</span></pre><pre style='margin:0'>
</pre>