Fix FreeBSD 13 build

Revert "Fix arch detection on macos"
This reverts commit dbadcf1858.
2021-12-02 16:24:25 +01:00 · 2021-12-01 20:54:44 +01:00 · 2021-12-01 20:39:05 +01:00
3 changed files with 9 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -217,6 +217,9 @@ variables:
    - .freebsd13
    - .root_cleanup
  before_script:
+    - sudo pkg update
+    - sudo pkg install --yes compat12x-amd64
+    - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
    - ./.gitlab/before_script/freebsd/install_deps.sh

 .test_ghcup_version:windows:
@@ -595,6 +598,9 @@ release:freebsd13:
    - .release_ghcup
    - .root_cleanup
  before_script:
+    - sudo pkg update
+    - sudo pkg install --yes compat12x-amd64
+    - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
    - ./.gitlab/before_script/freebsd/install_deps.sh
  variables:
    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
--- a/cabal.project
+++ b/cabal.project
@@ -15,7 +15,8 @@ source-repository-package

 constraints: http-io-streams -brotli,
             any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             streamly == 0.8.0

 package libarchive
  flags: -system-libarchive
--- a/scripts/bootstrap/bootstrap-haskell
+++ b/scripts/bootstrap/bootstrap-haskell
@@ -240,9 +240,7 @@ download_ghcup() {
 			_url=${base_url}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
            ;;
        "Darwin"|"darwin")
-            # uname -m and arch seem to behave different under rosetta
-            # https://superuser.com/questions/835514/why-do-uname-p-and-uname-m-and-arch-output-different-architectures
-            case "$(arch)" in
+			case "${arch}" in
 				x86_64|amd64)
 					_url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver}
 					;;
Author	SHA1	Message	Date
Julian Ospald	185a9822ea	Fix FreeBSD 13 build	2021-12-02 16:24:25 +01:00
Julian Ospald	c97ade81fa	Revert "Fix arch detection on macos" This reverts commit `dbadcf1858`.	2021-12-01 20:54:44 +01:00
Julian Ospald	82a22fe993	Merge branch 'darwin-arch'	2021-12-01 20:39:05 +01:00