Update stage scripts for crosstools based linux build
This commit is contained in:
parent
bd36724a09
commit
4a2c335c06
37 changed files with 84 additions and 121 deletions
|
@ -14,15 +14,11 @@ ffbuild_dockerbuild() {
|
|||
|
||||
mkdir build && cd build
|
||||
|
||||
if [[ $VARIANT == *shared* && $TARGET == linux* ]]; then
|
||||
USE_OMP="OFF"
|
||||
else
|
||||
USE_OMP="ON"
|
||||
fi
|
||||
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DWITH_OPENMP="$USE_OMP" -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DWITH_OPENMP=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
|
||||
make -j$(nproc)
|
||||
make install
|
||||
|
||||
echo "Libs.private: -lgomp" >> "$FFBUILD_PREFIX"/lib/pkgconfig/soxr.pc
|
||||
}
|
||||
|
||||
ffbuild_configure() {
|
||||
|
@ -33,10 +29,6 @@ ffbuild_unconfigure() {
|
|||
echo --disable-libsoxr
|
||||
}
|
||||
|
||||
ffbuild_ldflags() {
|
||||
echo -pthread
|
||||
}
|
||||
|
||||
ffbuild_libs() {
|
||||
[[ $VARIANT == *shared* && $TARGET == linux* ]] || echo -lgomp
|
||||
echo -lgomp
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue