diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-11-07 22:11:39 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-11-12 18:44:22 -0500 |
| commit | 934ddebfa548fdb6a8f5bb1bdd50f935fd22264e (patch) | |
| tree | 8b135bca73f9955552b38b57f05f25d85bd2b065 | |
| parent | 643d42fcf68f9b96bc8829d20bcd8f5fef84a78c (diff) | |
| download | haskell-wip/bump-win32-patcher.tar.gz | |
get-win32-tarballs: Update win32 patcherwip/bump-win32-patcher
This updates the win32 MIN_PATH patcher to 0.4, adding support for
`rename` and `_wrename`.
| -rwxr-xr-x | mk/get-win32-tarballs.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh index 4732ede52d..d09e6964e4 100755 --- a/mk/get-win32-tarballs.sh +++ b/mk/get-win32-tarballs.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash +jailbreak_version="0.4" tarball_dir='ghc-tarballs' missing_files=0 -pkg_variant="phyx" +pkg_variant="phyx$jailbreak_version" # see #12502 if test -z "$FIND"; then FIND="find"; fi @@ -184,7 +185,7 @@ patch_tarball () { local tarball_name="$1" local filename=$(basename "$tarball_name") local filepath=$(dirname "$tarball_name") - local newfile=`echo "$filepath/$filename" | sed -e 's/-any/-phyx/'` + local newfile=$(echo "$filepath/$filename" | sed -e "s/-any/-${pkg_variant}/") local arch="" echo "=> ${filename}" @@ -274,14 +275,15 @@ case $1 in patch) export -f patch_tarball export -f patch_single_file + export pkg_variant echo "Downloading ghc-jailbreak..." - curl -f -L https://mistuke.blob.core.windows.net/binaries/ghc-jailbreak-0.3.tar.gz \ + curl -f -L https://mistuke.blob.core.windows.net/binaries/ghc-jailbreak-${jailbreak_version}.tar.gz \ -o ghc-tarballs/ghc-jailbreak/ghc-jailbreak.tar.gz --create-dirs -# tar -C ghc-tarballs/ghc-jailbreak/ -xf ghc-tarballs/ghc-jailbreak/ghc-jailbreak.tar.gz - find ghc-tarballs/mingw-w64/ \( -iname "*binutils*.tar.xz" \ - -o -iname "*gcc*.tar.xz" \) \ + find ghc-tarballs/mingw-w64/ \( -iname "*binutils*-any.pkg.tar.xz" \ + -o -iname "*gcc*-any.pkg.tar.xz" \) \ -exec bash -c 'patch_tarball "$0"' {} \; rm -rf ghc-tarballs/ghc-jailbreak |