forked from boostorg/config
Merge pull request #451 from boostorg/issue399
GNU libstdc++3 _GTHREAD_USE_MUTEX_TIMEDLOCK is not used post gcc-6.
This commit is contained in:
67
.github/workflows/ci.yml
vendored
67
.github/workflows/ci.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
compiler: [ g++-11, g++-12, clang++-14 ]
|
compiler: [ g++-11, g++-12, clang++-14 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -65,7 +65,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
compiler: [ clang++-11, clang++-12, clang++-13 ]
|
compiler: [ clang++-11, clang++-12, clang++-13 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -109,7 +109,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
compiler: [ g++-9, g++-10, clang++-9, clang++-10 ]
|
compiler: [ g++-9, g++-10, clang++-9, clang++-10 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -146,14 +146,49 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
|
run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
|
||||||
working-directory: ../boost-root/libs/config/test
|
working-directory: ../boost-root/libs/config/test
|
||||||
macos:
|
macos_11:
|
||||||
runs-on: macos-latest
|
runs-on: macos-11
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
toolset: [ clang, gcc-11, gcc-10, gcc-9 ]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: '0'
|
||||||
|
- uses: mstachniuk/ci-skip@v1
|
||||||
|
with:
|
||||||
|
commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[linux];[Linux];[LINUX]'
|
||||||
|
commit-filter-separator: ';'
|
||||||
|
fail-fast: true
|
||||||
|
- name: Checkout main boost
|
||||||
|
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
|
||||||
|
- name: Update Dependencies
|
||||||
|
run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits
|
||||||
|
working-directory: ../boost-root
|
||||||
|
- name: Copy files
|
||||||
|
run: cp -r $GITHUB_WORKSPACE/* libs/config
|
||||||
|
working-directory: ../boost-root
|
||||||
|
- name: Bootstrap
|
||||||
|
run: ./bootstrap.sh
|
||||||
|
working-directory: ../boost-root
|
||||||
|
- name: Generate headers
|
||||||
|
run: ./b2 headers
|
||||||
|
working-directory: ../boost-root
|
||||||
|
- name: Config info
|
||||||
|
run: ../../../b2 print_config_info toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a
|
||||||
|
working-directory: ../boost-root/libs/config/test
|
||||||
|
- name: Test
|
||||||
|
run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a
|
||||||
|
working-directory: ../boost-root/libs/config/test
|
||||||
|
macos_12:
|
||||||
|
runs-on: macos-12
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
toolset: [ clang ]
|
toolset: [ clang ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -191,7 +226,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
toolset: [ msvc-14.0 ]
|
toolset: [ msvc-14.0 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -229,7 +264,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
toolset: [ msvc-14.2 ]
|
toolset: [ msvc-14.2 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -267,7 +302,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
toolset: [ msvc-14.3 ]
|
toolset: [ msvc-14.3 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -305,7 +340,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
toolset: [ clang-msvc-14.3 ]
|
toolset: [ clang-msvc-14.3 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -340,8 +375,8 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
qemu_arch: [ aarch64, s390x, ppc64le ]
|
qemu_arch: [ aarch64, s390x, ppc64le ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2.1.0
|
- uses: actions/checkout@v3
|
||||||
- uses: uraimo/run-on-arch-action@v2.0.5
|
- uses: uraimo/run-on-arch-action@v2
|
||||||
name: Run commands
|
name: Run commands
|
||||||
id: runcmd
|
id: runcmd
|
||||||
with:
|
with:
|
||||||
@@ -376,8 +411,8 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
qemu_arch: [ aarch64, ppc64le ]
|
qemu_arch: [ aarch64, ppc64le ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2.1.0
|
- uses: actions/checkout@v3
|
||||||
- uses: uraimo/run-on-arch-action@v2.0.5
|
- uses: uraimo/run-on-arch-action@v2
|
||||||
name: Run commands
|
name: Run commands
|
||||||
id: runcmd
|
id: runcmd
|
||||||
with:
|
with:
|
||||||
@@ -413,7 +448,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
compiler: [ emcc ]
|
compiler: [ emcc ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
@@ -490,7 +525,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
std: [ 11, 14, 17 ]
|
std: [ 11, 14, 17 ]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
- uses: mstachniuk/ci-skip@v1
|
- uses: mstachniuk/ci-skip@v1
|
||||||
|
@@ -459,7 +459,7 @@ extern "C" char *gets (char *__s);
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (!defined(_GTHREAD_USE_MUTEX_TIMEDLOCK) || (_GTHREAD_USE_MUTEX_TIMEDLOCK == 0)) && !defined(BOOST_NO_CXX11_HDR_MUTEX)
|
#if (!defined(_GTHREAD_USE_MUTEX_TIMEDLOCK) || (_GTHREAD_USE_MUTEX_TIMEDLOCK == 0)) && !defined(BOOST_NO_CXX11_HDR_MUTEX) && (__GNUC__ < 6)
|
||||||
// Timed mutexes are not always available:
|
// Timed mutexes are not always available:
|
||||||
# define BOOST_NO_CXX11_HDR_MUTEX
|
# define BOOST_NO_CXX11_HDR_MUTEX
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user