Commit c2bc5941 authored by Julian Ospald's avatar Julian Ospald 🍵

Improve notarization wrt #134

parent b06a90b9
Pipeline #17107 passed with stage
in 15 minutes and 11 seconds
...@@ -1041,6 +1041,19 @@ mktempdir() { ...@@ -1041,6 +1041,19 @@ mktempdir() {
unset mktemp_mydistro unset mktemp_mydistro
} }
# @FUNCTION: darwin_notarization
# @USAGE: <path>
# @DESCRIPTION:
# https://gitlab.haskell.org/ghc/ghc/issues/17418
# Can safely be invoked without distro check.
darwin_notarization() {
[ -z "$1" ] && die "Internal error: no argument given to darwin_notarization"
if [ "$(get_distro_alias "$(get_distro_name)")" = "darwin" ] ; then
edo xattr -r -d com.apple.quarantine "$1"
fi
}
# @FUNCTION: unpack # @FUNCTION: unpack
# @USAGE: <tarball> # @USAGE: <tarball>
# @DESCRIPTION: # @DESCRIPTION:
...@@ -1456,10 +1469,7 @@ install_ghc() { ...@@ -1456,10 +1469,7 @@ install_ghc() {
edo cd "./ghc-${myghcver}" edo cd "./ghc-${myghcver}"
# https://gitlab.haskell.org/ghc/ghc/issues/17418 darwin_notarization .
if [ "$(get_distro_alias "$(get_distro_name)")" = "darwin" ] ; then
edo xattr -cr .
fi
debug_message "Installing GHC into ${inst_location}" debug_message "Installing GHC into ${inst_location}"
...@@ -1737,10 +1747,7 @@ install_cabal() { ...@@ -1737,10 +1747,7 @@ install_cabal() {
unpack "${download_tarball_name}" unpack "${download_tarball_name}"
fi fi
# https://gitlab.haskell.org/ghc/ghc/issues/17418 darwin_notarization .
if [ "$(get_distro_alias "$(get_distro_name)")" = "darwin" ] ; then
edo xattr -cr .
fi
edo mv -f cabal "${inst_location}"/cabal edo mv -f cabal "${inst_location}"/cabal
if [ -f "${tmp_dir}/${download_tarball_name}" ] ; then if [ -f "${tmp_dir}/${download_tarball_name}" ] ; then
...@@ -1806,10 +1813,7 @@ compile_ghc() { ...@@ -1806,10 +1813,7 @@ compile_ghc() {
edo cd "./ghc-${myghcver}" edo cd "./ghc-${myghcver}"
# https://gitlab.haskell.org/ghc/ghc/issues/17418 darwin_notarization .
if [ "$(get_distro_alias "$(get_distro_name)")" = "darwin" ] ; then
edo xattr -cr .
fi
if [ -n "${build_config}" ] ; then if [ -n "${build_config}" ] ; then
edo cat "${build_config}" > mk/build.mk edo cat "${build_config}" > mk/build.mk
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment