Skip to content

Commit

Permalink
Stop using devtoolset-2 to provide GCC4.8
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
sxa committed Oct 5, 2021
1 parent e06449a commit ebbcc4b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,6 @@
- ! (ansible_distribution_major_version == "7" and ansible_architecture == "s390x")
tags: build_tools

- name: Add devtools-2 to yum repo list for gcc 4.8
get_url:
url: https://people.centos.org/tru/devtools-2/devtools-2.repo
dest: /etc/yum.repos.d/devtools-2.repo
timeout: 25
checksum: sha256:a8ebeb4bed624700f727179e6ef771dafe47651131a00a78b342251415646acc
when:
- ansible_distribution_major_version == "6"
tags: build_tools

- name: Install gcc4.8
package: "name={{ item }} state=latest"
with_items: "{{ gcc48_devtoolset_compiler }}"
when:
- ansible_distribution_major_version == "6"
tags: build_tools


- name: Install CentOS SCL x86_64 repo for gcc7.3
package: "name=centos-release-scl state=latest"
when:
Expand All @@ -119,42 +101,6 @@
- ansible_architecture == "x86_64"
tags: build_tools

- name: Create symlink for /opt/rh/devtoolset-2/root/usr/bin/gcc to gcc
file:
src: /opt/rh/devtoolset-2/root/usr/bin/gcc
dest: /usr/bin/gcc
force: true
owner: root
group: root
state: link
when:
- ansible_distribution_major_version == "6"
tags: build_tools

- name: Create symlink for /opt/rh/devtoolset-2/root/usr/bin/g++ to g++
file:
src: /opt/rh/devtoolset-2/root/usr/bin/g++
dest: /usr/bin/g++
force: true
owner: root
group: root
state: link
when:
- ansible_distribution_major_version == "6"
tags: build_tools

- name: Create symlink for /opt/rh/devtoolset-2/root/usr/bin/c++ to c++
file:
src: /opt/rh/devtoolset-2/root/usr/bin/c++
dest: /usr/bin/c++
force: true
owner: root
group: root
state: link
when:
- ansible_distribution_major_version == "6"
tags: build_tools

##############################
# expat on CentOS on x86_64 #
##############################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ Build_Tool_Packages:
- xz
- zip

gcc48_devtoolset_compiler:
- devtoolset-2-gcc
- devtoolset-2-binutils
- devtoolset-2-gcc-c++

Additional_Build_Tools_CentOS7:
- libstdc++-static
- ccache
Expand Down

0 comments on commit ebbcc4b

Please sign in to comment.