Skip to content
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.

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

No ctng and build GCC 10, 11 #53

Merged
merged 54 commits into from
Jul 23, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7d41f5a
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
isuruf Jul 13, 2021
7be194a
Remove ct-ng and build gcc directly
isuruf Jul 13, 2021
c849192
Remove putting files in sysroot
isuruf Jul 13, 2021
014796f
Add patch and run tests
isuruf Jul 14, 2021
f112a49
Fix gxx include dir
isuruf Jul 14, 2021
4a1e262
remove dependence of libgcc-ng on libgcc_devel
isuruf Jul 14, 2021
f859840
rerender
isuruf Jul 15, 2021
2bc41b0
Support cross compilers
isuruf Jul 15, 2021
3493e6c
gcc_dev channel
isuruf Jul 15, 2021
71694a0
Use TARGET instead of HOST
isuruf Jul 15, 2021
06e6ce2
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
isuruf Jul 15, 2021
db0968f
fix binutils target
isuruf Jul 15, 2021
b3de5e9
disable aarch64 and ppc64le for now
isuruf Jul 15, 2021
e572f7b
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
isuruf Jul 15, 2021
f514c15
comment out 7, 8 for now
isuruf Jul 15, 2021
9ef1279
move libgcc_s and libcc1 to CHOST specific dir
isuruf Jul 15, 2021
b946527
Fix libgcc-devel
isuruf Jul 15, 2021
111d8da
Fix cross compiler tests
isuruf Jul 15, 2021
c9005db
Add sha256
isuruf Jul 15, 2021
13bdc9c
restore libgfortran-ng constraint
isuruf Jul 15, 2021
69a7a98
Revert "restore libgfortran-ng constraint"
isuruf Jul 15, 2021
4f96953
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
isuruf Jul 15, 2021
bfe51fd
update to 9.4.0
isuruf Jul 15, 2021
a8d2b84
cross native compilers
isuruf Jul 15, 2021
ba43015
rerender
isuruf Jul 16, 2021
526702d
Working canadian cross compilers
isuruf Jul 16, 2021
5137ae1
hack for conda/conda-build#4248
isuruf Jul 17, 2021
24977a2
don't install libgcc_so.1 to prefix/lib when cross
isuruf Jul 17, 2021
06e3107
symlink build tools
isuruf Jul 17, 2021
deb9a92
fix setting symlinks
isuruf Jul 17, 2021
e040b26
Fix making directories
isuruf Jul 17, 2021
9165d00
try setting CC_FOR_BUILD and CC_FOR_TARGET
isuruf Jul 17, 2021
afe0050
Fix setting CXXFILT
isuruf Jul 17, 2021
defa200
Set FC
isuruf Jul 17, 2021
0058eef
set gcc_cv_objdump
isuruf Jul 17, 2021
190b090
rerender
isuruf Jul 18, 2021
56e1c1f
store build artifacts
isuruf Jul 18, 2021
ab51a0a
Fix libgomp.spec
isuruf Jul 18, 2021
eec7a51
remveo debug
isuruf Jul 18, 2021
b8355a7
fix libgcc_s.so
isuruf Jul 18, 2021
2d1d41f
add more tests
isuruf Jul 18, 2021
233b7bc
fix test
isuruf Jul 18, 2021
8c0697a
fix clobbering
isuruf Jul 18, 2021
97d63b2
no store build artifacts
isuruf Jul 18, 2021
0154c23
Show config log
isuruf Jul 18, 2021
ce4f5d9
Use BUILD_PREFIX for build sysroot
isuruf Jul 18, 2021
73bef16
enable bootstrap
isuruf Jul 18, 2021
ff17eea
Revert "enable bootstrap"
isuruf Jul 21, 2021
7716704
Use bootstrap compier
isuruf Jul 22, 2021
cd9f351
Build 9.4.0, 10.3.0 and 11.1.0
isuruf Jul 22, 2021
d760867
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
isuruf Jul 22, 2021
6358fcb
some refactoring
isuruf Jul 22, 2021
1ee51eb
put conda-build hack back in
isuruf Jul 22, 2021
baf8982
Fix dumpspecs
isuruf Jul 22, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-64
use_system_gcc:
- 'False'
zip_keys:
- - cdt_name
- docker_image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-64
use_system_gcc:
- 'False'
zip_keys:
- - cdt_name
- docker_image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-64
use_system_gcc:
- 'False'
zip_keys:
- - cdt_name
- docker_image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-64
use_system_gcc:
- 'False'
zip_keys:
- - cdt_name
- docker_image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-aarch64
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-aarch64
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-aarch64
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-aarch64
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-ppc64le
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-ppc64le
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-ppc64le
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ openmp_ver:
- '4.5'
target_platform:
- linux-ppc64le
use_system_gcc:
- 'False'
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ cd build
--enable-plugin \
--enable-gold \
--disable-nls \
--disable-bootstrap \
beckermr marked this conversation as resolved.
Show resolved Hide resolved
--disable-multilib \
--enable-long-long \
--enable-default-pie \
Expand Down
3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ _libgcc_mutex:
- 0.1 conda_forge
channel_targets:
- conda-forge gcc_dev
use_system_gcc:
- True # [not (linux64 or aarch64 or ppc64le or s390x)]
- False # [linux64 or aarch64 or ppc64le or s390x]
zip_keys:
- - conda_glibc_ver
- old_ctng_vendor
Expand Down
17 changes: 14 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ requirements:
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}

Expand All @@ -56,6 +57,7 @@ outputs:
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
test:
Expand Down Expand Up @@ -87,6 +89,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand Down Expand Up @@ -130,6 +133,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand All @@ -145,9 +149,9 @@ outputs:
- {{ pin_subpackage("libgcc-ng", max_pin=None) }} # [target_platform == ctng_target_platform]
- {{ pin_subpackage("libgomp", max_pin=None) }} # [target_platform == ctng_target_platform]
- sysroot_{{ ctng_target_platform }}
# Any version newer than the devtoolset works. This can be removed when bootstrapping.
- libstdcxx-ng >=4.9
- libgcc-ng >=4.9
# Any version newer than the devtoolset works.
- libstdcxx-ng >=4.9 # [use_system_gcc]
- libgcc-ng >=4.9 # [use_system_gcc]
run_exports:
# impose this requirement across the build/host boundary
strong:
Expand Down Expand Up @@ -195,6 +199,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand Down Expand Up @@ -249,6 +254,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
# For cpp and crt{i,n}.o
Expand Down Expand Up @@ -308,6 +314,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand All @@ -332,6 +339,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- {{ pin_subpackage("libgomp", exact=True) }}
Expand Down Expand Up @@ -376,6 +384,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand Down Expand Up @@ -417,6 +426,7 @@ outputs:
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
host:
- {{ pin_subpackage('libgomp', exact=True) }}
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand Down Expand Up @@ -463,6 +473,7 @@ outputs:
- gcc_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gxx_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gfortran_impl_{{ ctng_target_platform }} # [build_platform != target_platform]
- gcc_bootstrap_{{ build_platform }} <={{ ctng_gcc }} # [not use_system_gcc and build_platform == target_platform]
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
host:
- sysroot_{{ ctng_target_platform }} {{ conda_glibc_ver }}
Expand Down