diff options
Diffstat (limited to 'lang/nim/files')
| -rw-r--r-- | lang/nim/files/patch-config-nim.cfg | 19 | ||||
| -rw-r--r-- | lang/nim/files/patch-install.sh | 10 | ||||
| -rw-r--r-- | lang/nim/files/patch-koch.nim | 109 |
3 files changed, 10 insertions, 128 deletions
diff --git a/lang/nim/files/patch-config-nim.cfg b/lang/nim/files/patch-config-nim.cfg index 0ff00533ee84..f7959f5635bf 100644 --- a/lang/nim/files/patch-config-nim.cfg +++ b/lang/nim/files/patch-config-nim.cfg @@ -1,4 +1,4 @@ ---- config/nim.cfg.orig 2019-07-22 09:41:23 UTC +--- config/nim.cfg.orig 2020-04-03 17:22:53 UTC +++ config/nim.cfg @@ -8,7 +8,7 @@ # Environment variables can be accessed like so: @@ -9,25 +9,16 @@ # additional options always passed to the compiler: --parallel_build: "0" # 0 to auto-detect number of processors -@@ -105,12 +105,6 @@ path="$lib/pure" +@@ -118,12 +118,6 @@ path="$lib/pure" + clang.options.linker = "-ldl" clang.cpp.options.linker = "-ldl" tcc.options.linker = "-ldl" - @end +- @end - @if bsd: - # BSD got posix_spawn only recently, so we deactivate it for osproc: - define:useFork - # at least NetBSD has problems with thread local storage: - tlsEmulation:on -- @end + @end @if haiku: 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__" diff --git a/lang/nim/files/patch-install.sh b/lang/nim/files/patch-install.sh index 61943d414f83..5b6a8f913327 100644 --- a/lang/nim/files/patch-install.sh +++ b/lang/nim/files/patch-install.sh @@ -1,4 +1,4 @@ ---- install.sh.orig 2020-01-31 16:27:59 UTC +--- install.sh.orig 2020-04-03 17:25:49 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-1.0.6" +- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0" - ;; - "/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-1.0.6" +- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0" - ;; - "/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-1.0.6" +- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0" - mkdir -p /opt/nim - mkdir -p $bindir - mkdir -p $configdir @@ -54,7 +54,7 @@ nimbleDir="$1/nim" mkdir -p $1/nim mkdir -p $bindir -@@ -923,13 +889,6 @@ chmod 644 $nimbleDir/compiler.nimble +@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble else echo "Nim installation script" echo "Usage: [sudo] sh install.sh DIR" diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim deleted file mode 100644 index 3e8a494469fa..000000000000 --- a/lang/nim/files/patch-koch.nim +++ /dev/null @@ -1,109 +0,0 @@ ---- koch.nim.orig 2019-07-22 09:56:30 UTC -+++ koch.nim -@@ -43,15 +43,11 @@ Usage: - koch [options] command [options for command] - Options: - --help, -h shows this help and quits -- --latest bundle the installers with a bleeding edge Nimble -- --stable bundle the installers with a stable Nimble (default) - Possible Commands: - boot [options] bootstraps with given command line options - distrohelper [bindir] helper for distro packagers -- tools builds Nim related tools -- toolsNoNimble builds Nim related tools (except nimble) -+ tools builds Nim related tools (except nimble) - doesn't require network connectivity -- nimble builds the Nimble tool - Boot options: - -d:release produce a release version of the compiler - -d:useLinenoise use the linenoise library for interactive mode -@@ -127,41 +123,6 @@ proc bundleC2nim(args: string) = - nimCompile("dist/c2nim/c2nim", - options = "--noNimblePath --path:. " & args) - --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: -- withDir("dist/nimble"): -- 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 " & args) -- --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" -- if not latest and dirExists(installDir) and not dirExists("dist/nimble/.git"): -- discard "don't do the git dance" -- else: -- if not dirExists("dist/nimble/.git"): -- if dirExists(installDir): -- var id = 0 -- while dirExists("dist/nimble" & $id): -- inc id -- installDir = "dist/nimble" & $id -- exec("git clone https://github.com/nim-lang/nimble.git " & installDir) -- withDir(installDir): -- if latest: -- exec("git checkout -f master") -- exec("git pull") -- else: -- exec("git fetch") -- exec("git checkout " & NimbleStableCommit) -- nimCompile(installDir / "src/nimble.nim", -- options = "--noNimblePath --nilseqs:on -d:release " & args) -- - 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) - - proc zip(latest: bool; args: string) = -- 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" % -@@ -219,7 +179,6 @@ proc buildTools(args: string = "") = - options = "-d:release " & args) - - proc nsis(latest: bool; args: string) = -- bundleNimbleExe(latest, args) - bundleNimsuggest(args) - bundleWinTools(args) - # make sure we have generated the niminst executables: -@@ -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") - -- ## build nimble early on to enable remainder to depend on it if needed -- kochExecFold("Build Nimble", "nimble") - - when false: - 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) -- of "latest": latest = true -- of "stable": latest = false - else: showHelp() - of cmdArgument: - case normalize(op.key) -@@ -613,13 +568,9 @@ when isMainModule: - of "temp": temp(op.cmdLineRest) - of "xtemp": xtemp(op.cmdLineRest) - of "wintools": bundleWinTools(op.cmdLineRest) -- of "nimble": buildNimble(latest, op.cmdLineRest) - of "nimsuggest": bundleNimsuggest(op.cmdLineRest) -- of "toolsnonimble": -- buildTools(op.cmdLineRest) - of "tools": - buildTools(op.cmdLineRest) -- buildNimble(latest, op.cmdLineRest) - of "pushcsource", "pushcsources": pushCsources() - of "valgrind": valgrind(op.cmdLineRest) - of "c2nim": bundleC2nim(op.cmdLineRest) |