Skip to content

feat(install.sh): download GCC release tar balls #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2021
Merged

feat(install.sh): download GCC release tar balls #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions prerequisites/build-functions/set_or_print_downloader.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ set_or_print_downloader()

package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}"

if [[ "${package_name}" == "gcc" ]]; then
arg_b=${arg_b:-releases/gcc-${version_to_build}}
elif [[ "${package_name}" == "ofp" ]]; then
if [[ "${package_name}" == "ofp" ]]; then
"${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh" "${@}"
exit 0
fi
Expand All @@ -36,7 +34,7 @@ set_or_print_downloader()
tried="curl, wget, and ftp"
fi

if [[ "${package_name}" == "gcc" ]]; then
if [[ "${package_name}" == "gcc" && ! -z ${arg_b:-} ]]; then
if type git &> /dev/null; then
fetch=git
else
Expand Down
11 changes: 9 additions & 2 deletions prerequisites/build-functions/set_or_print_url.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ else
major_minor="${version_to_build%.*}"
fi
package_url_head=(
"gcc;https://gcc.gnu.org/git/"
"gcc;https://ftp.gnu.org/gnu/gcc/gcc-${version_to_build-}/"
"wget;https://ftpmirror.gnu.org/gnu/wget/"
"m4;https://ftpmirror.gnu.org/gnu/m4/"
"pkg-config;https://pkgconfig.freedesktop.org/releases/"
Expand All @@ -44,9 +44,13 @@ else
fi
done

if [[ ! -z ${arg_b:-} && ${package_to_build} == 'gcc' ]]; then
url_head="https://gcc.gnu.org/git/"
fi

# Set differing tails for GCC release downloads versus development branch checkouts
package_url_tail=(
"gcc;gcc"
"gcc;gcc-${version_to_build-}.tar.gz"
"wget;wget-${version_to_build-}.tar.gz"
"m4;m4-${version_to_build-}.tar.bz2"
"pkg-config;pkg-config-${version_to_build-}.tar.gz"
Expand All @@ -71,6 +75,9 @@ else
fi
done

if [[ ! -z ${arg_b:-} && ${package_to_build} == 'gcc' ]]; then
url_tail="gcc"
fi

if [[ -z "${url_head:-}" || -z "${url_tail}" ]]; then
emergency "Package ${package_name:-} not recognized. Use --l or --list-packages to list the allowable names."
Expand Down