fix(oneTBB)

closes #5870
This commit is contained in:
Jacob Heider 2024-04-12 16:03:42 -04:00 committed by Jacob Heider
parent b65964f694
commit 501e095747

View file

@ -27,10 +27,6 @@ build:
cmake.org: '*' cmake.org: '*'
swig.org: '*' swig.org: '*'
freedesktop.org/pkg-config: '*' freedesktop.org/pkg-config: '*'
linux:
llvm.org: '*'
gnu.org/gcc: '>=4.8.5<11.2.1'
gnu.org/make: '*'
working-directory: build working-directory: build
script: script:
#build shared #build shared
@ -47,27 +43,22 @@ build:
install ./*/libtbb*.a {{prefix}}/lib/ install ./*/libtbb*.a {{prefix}}/lib/
working-directory: static working-directory: static
# build python # build irml
- run: | - run: |
cmake -S ../.. $CMAKE_ARGS -DTBB4PY_BUILD=ON cmake -S ../.. $CMAKE_ARGS -DTBB4PY_BUILD=ON
make irml make irml
install gnu*/* {{prefix}}/lib install clang*/* {{prefix}}/lib
export LDFLAGS="-L{{prefix}}/lib/libirml.so -lirml $LDFLAGS" export LDFLAGS="-L{{prefix}}/lib/libirml.so -lirml $LDFLAGS"
export PYTHONPATH="$PWD/build/python{{deps.python.org.version.marketing}}/site-packages:$PYTHONPATH" export PYTHONPATH="$PWD/build/python{{deps.python.org.version.marketing}}/site-packages:$PYTHONPATH"
export CXX=clang++
python ../../python/setup.py install --prefix=$PWD/build python ../../python/setup.py install --prefix=$PWD/build
working-directory: python working-directory: python
if: linux if: linux
- run: | - run: python3 -m pip install --prefix={{prefix}} .
python3 -m pip install --prefix={{prefix}} .
working-directory: ../python working-directory: ../python
# python 3.xx => 3 symlink # python 3.xx => 3 symlink
- run: | - run: ln -s python{{deps.python.org.version.marketing}} python{{deps.python.org.version.major}}
if [ ! -L "python{{deps.python.org.version.major}}" ]; then
ln -s python{{deps.python.org.version.marketing}} python{{deps.python.org.version.major}}
fi
working-directory: ${{prefix}}/lib working-directory: ${{prefix}}/lib
env: env:
@ -81,8 +72,8 @@ build:
- -DTBB_TEST=OFF - -DTBB_TEST=OFF
PYTHONPATH: '{{prefix}}/lib/python{{deps.python.org.version.marketing}}/site-packages:$PYTHONPATH' PYTHONPATH: '{{prefix}}/lib/python{{deps.python.org.version.marketing}}/site-packages:$PYTHONPATH'
linux: linux:
CC: gcc # undefined symbol errors in newer llvms prevent building shared libs
CXX: g++ CFLAGS: $CFLAGS -Wl,--undefined-version
test: test:
dependencies: dependencies: