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 · 2021-12-01 20:27:03 +01:00 · 2021-11-30 22:40:18 +01:00 · 2021-11-30 21:35:33 +01:00
3 changed files with 11 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
@@ -39,7 +39,6 @@ case "${plat}" in
 			;;
 		*)
 			: "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}"
-			export GHCUP_USE_XDG_DIRS

 			if [ -n "${GHCUP_USE_XDG_DIRS}" ] ; then
 				GHCUP_DIR=${XDG_DATA_HOME:=$HOME/.local/share}/ghcup
@@ -223,7 +222,8 @@ download_ghcup() {
            if freebsd-version | grep -E '^12.*' ; then
                freebsd_ver=12
            elif freebsd-version | grep -E '^13.*' ; then
-                freebsd_ver=13
+                # TODO: missing FreeBSD13 version
+                freebsd_ver=12
            else
                die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
            fi
@@ -237,7 +237,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${arch}"
 					;;
 			esac
-			_url=${base_url}/${ghver}/x86_64-portbld-freebsd${freebsd_ver}-ghcup-${ghver}
+			_url=${base_url}/${ghver}/x86_64-freebsd${freebsd_ver}-ghcup-${ghver}
            ;;
        "Darwin"|"darwin")
 			case "${arch}" in
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
Julian Ospald	dbadcf1858	Fix arch detection on macos	2021-12-01 20:27:03 +01:00
Julian Ospald	ff8865c5c3	Fix bootstrap on FreeBSD	2021-11-30 22:40:18 +01:00
Julian Ospald	9833dee925	Fix freebsd bootstrap	2021-11-30 21:35:33 +01:00
Julian Ospald	aac2874f8f	Fix boostrap-haskell on FreeBSD 13	2021-11-30 19:00:33 +01:00
Julian Ospald	17524b21b3	Merge branch 'issue-289'	2021-11-22 23:18:52 +01:00