File tree Expand file tree Collapse file tree 4 files changed +11
-25
lines changed
prerequisites/build-functions Expand file tree Collapse file tree 4 files changed +11
-25
lines changed Original file line number Diff line number Diff line change @@ -22,18 +22,8 @@ download_if_necessary()
22
22
args=(" -n" )
23
23
;;
24
24
" git" )
25
- args=(" clone" )
25
+ args=(" clone" " -b " " ${arg_b} " )
26
26
;;
27
- " svn" )
28
- case " ${arg_B:- } " in
29
- " gcc" )
30
- args=(" ls" )
31
- ;;
32
- * )
33
- args=(" checkout" )
34
- ;;
35
- esac
36
- ;;
37
27
" curl" )
38
28
first_three_characters=$( echo " ${package_url} " | cut -c1-3)
39
29
case " ${first_three_characters} " in
@@ -95,7 +85,7 @@ download_if_necessary()
95
85
emergency " Aborting [exit 90]"
96
86
else
97
87
98
- if [[ " ${fetch} " == " svn " || " ${fetch} " == " git" ]]; then
88
+ if [[ " ${fetch} " == " git" ]]; then
99
89
package_source_directory=" ${url_tail} "
100
90
else
101
91
package_source_directory=" ${package_name} -${version_to_build} "
@@ -110,7 +100,7 @@ download_if_necessary()
110
100
if [[ ! -z " ${arg_B:- } " ]]; then
111
101
return
112
102
else
113
- if [[ " ${fetch} " == " svn " ]]; then
103
+ if [[ " ${fetch} " == " git " ]]; then
114
104
search_path=" ${download_path} /${version_to_build} "
115
105
else
116
106
search_path=" ${download_path} /${url_tail} "
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ set_or_print_downloader()
17
17
fi
18
18
19
19
# Choose the first available download mechanism, prioritizing first any absolute requirement
20
- # (svn for gcc development branches) and second robustness:
20
+ # (git for gcc development branches) and second robustness:
21
21
info " Checking available download mechanisms: ftp, wget, and curl."
22
22
info " \$ {package_name}=${package_name} \$ {arg_b:-\$ {arg_B:-}}=${arg_b:- ${arg_B:- } } "
23
23
@@ -35,10 +35,10 @@ set_or_print_downloader()
35
35
fi
36
36
37
37
if [[ " ${package_name} " == " gcc" && ! -z " ${arg_b:- ${arg_B:- } } " ]]; then
38
- if type svn & > /dev/null; then
39
- fetch=svn
38
+ if type git & > /dev/null; then
39
+ fetch=git
40
40
else
41
- tried=" svn "
41
+ tried=" git "
42
42
fi
43
43
else
44
44
fetch=${gcc_prereqs_fetch}
Original file line number Diff line number Diff line change 23
23
if [[ -z " ${arg_b:- ${arg_B} } " ]]; then
24
24
gcc_url_head=" https://ftpmirror.gnu.org/gcc/gcc-${version_to_build} /"
25
25
else
26
- gcc_url_head=" svn ://gcc.gnu.org/svn/gcc /"
26
+ gcc_url_head=" git ://gcc.gnu.org/git /"
27
27
fi
28
28
fi
29
29
package_url_head=(
52
52
53
53
# Set differing tails for GCC release downloads versus development branch checkouts
54
54
if [[ " ${package_to_build} " == ' gcc' ]]; then
55
- if [[ " ${fetch} " == ' svn' ]]; then
56
- if [[ " ${version_to_build:- } " == " trunk" ]]; then
57
- gcc_tail=" ${version_to_build} "
58
- else
59
- gcc_tail=" branches/${version_to_build:- } "
60
- fi
55
+ if [[ " ${fetch} " == ' git' ]]; then
56
+ gcc_tail=" gcc.git"
61
57
else
62
58
gcc_tail=" gcc-${version_to_build} .tar.gz"
63
59
fi
Original file line number Diff line number Diff line change 2
2
# shellcheck disable=SC2154
3
3
unpack_if_necessary ()
4
4
{
5
- if [[ " ${fetch} " == " svn " || " ${fetch} " == " git" ]]; then
5
+ if [[ " ${fetch} " == " git" ]]; then
6
6
package_source_directory=" ${version_to_build} "
7
7
else
8
8
if [[ " ${url_tail} " == * tar.gz || " ${url_tail} " == * tar.bz2 || " ${url_tail} " == * .tar.xz ]]; then
You can’t perform that action at this time.
0 commit comments