Date: Mon, 2 Sep 2019 23:20:53 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510898 - in head/lang/nim: . files Message-ID: <201909022320.x82NKrwt027748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Sep 2 23:20:53 2019 New Revision: 510898 URL: https://svnweb.freebsd.org/changeset/ports/510898 Log: lang/nim: update to 0.20.2 PR: 239377 Submitted by: Neal Nelson <ports@nicandneal.net> (maintainer) Modified: head/lang/nim/Makefile (contents, props changed) head/lang/nim/distinfo (contents, props changed) head/lang/nim/files/patch-config-nim.cfg (contents, props changed) head/lang/nim/files/patch-install.sh (contents, props changed) head/lang/nim/files/patch-koch.nim (contents, props changed) head/lang/nim/pkg-plist (contents, props changed) Modified: head/lang/nim/Makefile ============================================================================== --- head/lang/nim/Makefile Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/Makefile Mon Sep 2 23:20:53 2019 (r510898) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nim -PORTVERSION= 0.20.0 +PORTVERSION= 0.20.2 CATEGORIES= lang MASTER_SITES= https://nim-lang.org/download/ Modified: head/lang/nim/distinfo ============================================================================== --- head/lang/nim/distinfo Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/distinfo Mon Sep 2 23:20:53 2019 (r510898) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559898379 -SHA256 (nim-0.20.0.tar.xz) = 51f479b831e87b9539f7264082bb6a64641802b54d2691b3c6e68ac7e2699a90 -SIZE (nim-0.20.0.tar.xz) = 4997088 +TIMESTAMP = 1563788376 +SHA256 (nim-0.20.2.tar.xz) = e1fa5c7e762a45535d82a961f88a6fc82e343985b780c3674081810e028d2b5e +SIZE (nim-0.20.2.tar.xz) = 5032768 Modified: head/lang/nim/files/patch-config-nim.cfg ============================================================================== --- head/lang/nim/files/patch-config-nim.cfg Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/files/patch-config-nim.cfg Mon Sep 2 23:20:53 2019 (r510898) @@ -1,5 +1,5 @@ ---- config/nim.cfg.orig 2018-10-08 18:40:28.240513000 +0200 -+++ config/nim.cfg 2018-10-08 18:42:30.824954000 +0200 +--- config/nim.cfg.orig 2019-07-22 09:41:23 UTC ++++ config/nim.cfg @@ -8,7 +8,7 @@ # Environment variables can be accessed like so: # gcc.path %= "$CC_PATH" @@ -9,7 +9,7 @@ # additional options always passed to the compiler: --parallel_build: "0" # 0 to auto-detect number of processors -@@ -82,12 +82,6 @@ +@@ -105,12 +105,6 @@ path="$lib/pure" clang.cpp.options.linker = "-ldl" tcc.options.linker = "-ldl" @end @@ -20,5 +20,14 @@ - tlsEmulation:on - @end @if haiku: - # Haiku currently have problems with TLS - # https://dev.haiku-os.org/ticket/14342 + gcc.options.linker = "-Wl,--as-needed -lnetwork" + gcc.cpp.options.linker = "-Wl,--as-needed -lnetwork" +@@ -132,7 +126,7 @@ path="$lib/pure" + @end + + @if nintendoswitch: +- cc = "switch_gcc" ++ cc = "switch_clang" + switch_gcc.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE" + switch_gcc.cpp.options.linker = "-g -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE" + switch_gcc.options.always = "-g -Wall -O2 -ffunction-sections -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -D__SWITCH__" Modified: head/lang/nim/files/patch-install.sh ============================================================================== --- head/lang/nim/files/patch-install.sh Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/files/patch-install.sh Mon Sep 2 23:20:53 2019 (r510898) @@ -1,4 +1,4 @@ ---- install.sh.orig 2019-05-14 10:18:34 UTC +--- install.sh.orig 2019-07-22 09:46:31 UTC +++ install.sh @@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then "--help"|"-h"|"help"|"h") @@ -19,7 +19,7 @@ - libdir=/usr/lib/nim - docdir=/usr/share/nim/doc - datadir=/usr/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.20.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.20.2" - ;; - "/usr/local/bin") - bindir=/usr/local/bin @@ -27,7 +27,7 @@ - libdir=/usr/local/lib/nim - docdir=/usr/local/share/nim/doc - datadir=/usr/local/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.20.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.20.2" - ;; - "/opt") - bindir="/opt/nim/bin" @@ -35,7 +35,7 @@ - libdir="/opt/nim/lib" - docdir="/opt/nim/doc" - datadir="/opt/nim/data" -- nimbleDir="/opt/nimble/pkgs/compiler-0.20.0" +- nimbleDir="/opt/nimble/pkgs/compiler-0.20.2" - mkdir -p /opt/nim - mkdir -p $bindir - mkdir -p $configdir @@ -54,7 +54,7 @@ nimbleDir="$1/nim" mkdir -p $1/nim mkdir -p $bindir -@@ -906,13 +872,6 @@ chmod 644 $nimbleDir/compiler.nimble +@@ -927,13 +893,6 @@ chmod 644 $nimbleDir/compiler.nimble else echo "Nim installation script" echo "Usage: [sudo] sh install.sh DIR" Modified: head/lang/nim/files/patch-koch.nim ============================================================================== --- head/lang/nim/files/patch-koch.nim Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/files/patch-koch.nim Mon Sep 2 23:20:53 2019 (r510898) @@ -1,16 +1,6 @@ ---- koch.nim.orig 2019-06-06 19:33:01 UTC +--- koch.nim.orig 2019-07-22 09:56:30 UTC +++ koch.nim -@@ -9,9 +9,6 @@ - # See doc/koch.txt for documentation. - # - --const -- NimbleStableCommit = "d15c8530cb7480ce39ffa85a2dd9819d2d4fc645" # 0.10.2 -- - when defined(gcc) and defined(windows): - when defined(x86): - {.link: "icons/koch.res".} -@@ -43,15 +40,11 @@ Usage: +@@ -43,15 +43,11 @@ Usage: koch [options] command [options for command] Options: --help, -h shows this help and quits @@ -27,11 +17,11 @@ Boot options: -d:release produce a release version of the compiler -d:useLinenoise use the linenoise library for interactive mode -@@ -126,39 +119,6 @@ proc bundleC2nim() = - exec("git clone https://github.com/nim-lang/c2nim.git dist/c2nim") - nimCompile("dist/c2nim/c2nim", options = "--noNimblePath --path:.") +@@ -127,41 +123,6 @@ proc bundleC2nim(args: string) = + nimCompile("dist/c2nim/c2nim", + options = "--noNimblePath --path:. " & args) --proc bundleNimbleExe(latest: bool) = +-proc bundleNimbleExe(latest: bool, args: string) = - if not dirExists("dist/nimble/.git"): - exec("git clone https://github.com/nim-lang/nimble.git dist/nimble") - if not latest: @@ -39,9 +29,10 @@ - exec("git fetch") - exec("git checkout " & NimbleStableCommit) - # installer.ini expects it under $nim/bin -- nimCompile("dist/nimble/src/nimble.nim", options = "-d:release --nilseqs:on") +- nimCompile("dist/nimble/src/nimble.nim", +- options = "-d:release --nilseqs:on " & args) - --proc buildNimble(latest: bool) = +-proc buildNimble(latest: bool, args: string) = - # if koch is used for a tar.xz, build the dist/nimble we shipped - # with the tarball: - var installDir = "dist/nimble" @@ -62,28 +53,29 @@ - else: - exec("git fetch") - exec("git checkout " & NimbleStableCommit) -- nimCompile(installDir / "src/nimble.nim", options = "--noNimblePath --nilseqs:on -d:release") +- nimCompile(installDir / "src/nimble.nim", +- options = "--noNimblePath --nilseqs:on -d:release " & args) - - proc bundleNimsuggest() = - nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", options = "-d:release -d:danger") + proc bundleNimsuggest(args: string) = + nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", + options = "-d:release -d:danger " & args) +@@ -182,7 +143,6 @@ proc bundleWinTools(args: string) = + options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) -@@ -177,7 +137,6 @@ proc bundleWinTools() = - nimCompile(r"tools\downloader.nim", options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui") - proc zip(latest: bool; args: string) = -- bundleNimbleExe(latest) - bundleNimsuggest() - bundleWinTools() +- bundleNimbleExe(latest, args) + bundleNimsuggest(args) + bundleWinTools(args) nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % -@@ -211,7 +170,6 @@ proc buildTools() = - nimCompileFold("Compile nimfind", "tools/nimfind.nim", options = "-d:release") +@@ -219,7 +179,6 @@ proc buildTools(args: string = "") = + options = "-d:release " & args) proc nsis(latest: bool; args: string) = -- bundleNimbleExe(latest) - bundleNimsuggest() - bundleWinTools() +- bundleNimbleExe(latest, args) + bundleNimsuggest(args) + bundleWinTools(args) # make sure we have generated the niminst executables: -@@ -457,17 +415,14 @@ proc runCI(cmd: string) = +@@ -466,8 +425,6 @@ proc runCI(cmd: string) = # boot without -d:nimHasLibFFI to make sure this still works kochExecFold("Boot in release mode", "boot -d:release -d:danger") @@ -91,18 +83,8 @@ - kochExecFold("Build Nimble", "nimble") when false: -- execFold("nimble install -y libffi", "nimble install -y libffi") - kochExecFold("boot -d:release -d:nimHasLibFFI", "boot -d:release -d:nimHasLibFFI") - - if getEnv("NIM_TEST_PACKAGES", "false") == "true": - execFold("Test selected Nimble packages", "nim c -r testament/tester cat nimble-packages") - else: -- buildTools() # altenatively, kochExec "tools --toolsNoNimble" -+ buildTools() - - ## run tests - execFold("Test nimscript", "nim e tests/test_nimscript.nims") -@@ -579,8 +534,6 @@ when isMainModule: + execFold("nimble install -y libffi", "nimble install -y libffi") +@@ -588,8 +545,6 @@ when isMainModule: case op.kind of cmdLongOption, cmdShortOption: case normalize(op.key) @@ -111,17 +93,17 @@ else: showHelp() of cmdArgument: case normalize(op.key) -@@ -604,13 +557,9 @@ when isMainModule: +@@ -613,13 +568,9 @@ when isMainModule: of "temp": temp(op.cmdLineRest) of "xtemp": xtemp(op.cmdLineRest) - of "wintools": bundleWinTools() -- of "nimble": buildNimble(latest) - of "nimsuggest": bundleNimsuggest() + of "wintools": bundleWinTools(op.cmdLineRest) +- of "nimble": buildNimble(latest, op.cmdLineRest) + of "nimsuggest": bundleNimsuggest(op.cmdLineRest) - of "toolsnonimble": -- buildTools() +- buildTools(op.cmdLineRest) of "tools": - buildTools() -- buildNimble(latest) + buildTools(op.cmdLineRest) +- buildNimble(latest, op.cmdLineRest) of "pushcsource", "pushcsources": pushCsources() of "valgrind": valgrind(op.cmdLineRest) - of "c2nim": bundleC2nim() + of "c2nim": bundleC2nim(op.cmdLineRest) Modified: head/lang/nim/pkg-plist ============================================================================== --- head/lang/nim/pkg-plist Mon Sep 2 23:19:26 2019 (r510897) +++ head/lang/nim/pkg-plist Mon Sep 2 23:20:53 2019 (r510898) @@ -58,6 +58,7 @@ lib/posix/linux.nim lib/posix/posix.nim lib/posix/posix_linux_amd64.nim lib/posix/posix_linux_amd64_consts.nim +lib/posix/posix_macos_amd64.nim lib/posix/posix_nintendoswitch.nim lib/posix/posix_nintendoswitch_consts.nim lib/posix/posix_other.nim @@ -223,7 +224,6 @@ lib/system/hti.nim lib/system/inclrtl.nim lib/system/indexerrors.nim lib/system/io.nim -lib/system/io.nim.cfg lib/system/iterators.nim lib/system/jssys.nim lib/system/memory.nim @@ -307,6 +307,7 @@ nim/compiler/importer.nim nim/compiler/incremental.nim nim/compiler/injectdestructors.nim nim/compiler/installer.ini +nim/compiler/int128.nim nim/compiler/jsgen.nim nim/compiler/jstypes.nim nim/compiler/lambdalifting.nim @@ -385,6 +386,7 @@ nim/compiler/semtypinst.nim nim/compiler/sighashes.nim nim/compiler/sigmatch.nim nim/compiler/sizealignoffsetimpl.nim +nim/compiler/spawn.nim nim/compiler/suggest.nim nim/compiler/syntaxes.nim nim/compiler/tccgen.nim
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909022320.x82NKrwt027748>