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 more cdts6 qt6 and Do not pass -DQT_REQUIRE_HOST_PATH_CHECK=OFF + libbbost 1.86 #287

Merged
merged 8 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
dbus:
- '1'
docker_image:
Expand All @@ -43,7 +43,7 @@ libpng:
libsqlite:
- '3'
libtiff:
- '4.6'
- '4.7'
libwebp:
- '1'
libxcb:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -23,7 +23,7 @@ curl:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
dbus:
- '1'
docker_image:
Expand All @@ -47,7 +47,7 @@ libpng:
libsqlite:
- '3'
libtiff:
- '4.6'
- '4.7'
libwebp:
- '1'
libxcb:
Expand Down
10 changes: 0 additions & 10 deletions .ci_support/migrations/gstreamer124.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/harfbuzz9.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions .ci_support/migrations/libboost186.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
__migrator:
build_number: 1
kind: version
commit_message: "Rebuild for libboost 1.86"
migration_number: 1
assimp:
- 5.4.2
libboost_devel:
- "1.86"
libboost_headers:
- "1.86"
libboost_python_devel:
- "1.86"
migrator_ts: 1723764795.6693385
10 changes: 0 additions & 10 deletions .ci_support/migrations/libxcb116.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
glib:
- '2'
harfbuzz:
Expand All @@ -35,7 +35,7 @@ libpng:
libsqlite:
- '3'
libtiff:
- '4.6'
- '4.7'
libwebp:
- '1'
macos_machine:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -19,7 +19,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
glib:
- '2'
harfbuzz:
Expand All @@ -35,7 +35,7 @@ libpng:
libsqlite:
- '3'
libtiff:
- '4.6'
- '4.7'
libwebp:
- '1'
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ libpng:
libsqlite:
- '3'
libtiff:
- '4.6'
- '4.7'
libwebp:
- '1'
openssl:
Expand Down
15 changes: 1 addition & 14 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
os_version:
linux_64: cos7
provider:
linux_aarch64: default
test: native_and_emulated
67 changes: 7 additions & 60 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,59 +1,10 @@
#!/bin/sh
set -ex

if [[ "$CONDA_BUILD_CROSS_COMPILATION" = "1" ]]; then
if [[ "${build_platform}" == "linux-64" ]]; then
# There are probably equivalent CDTs to install if your build platform
# is something else. However, it is most common in 2023 to use the x86_64
# hardware to cross compile for other architectures.
mamba install --yes \
--prefix ${BUILD_PREFIX} \
mesa-libgl-devel-${cdt_name}-x86_64 \
mesa-libegl-devel-${cdt_name}-x86_64 \
mesa-dri-drivers-${cdt_name}-x86_64 \
libdrm-devel-${cdt_name}-x86_64 \
libglvnd-glx-${cdt_name}-x86_64 \
libglvnd-egl-${cdt_name}-x86_64
fi
(
export CC=$CC_FOR_BUILD
export CXX=$CXX_FOR_BUILD
export LDFLAGS=${LDFLAGS//$PREFIX/$BUILD_PREFIX}
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH//$PREFIX/$BUILD_PREFIX}
export CFLAGS=${CFLAGS//$PREFIX/$BUILD_PREFIX}
export CXXFLAGS=${CXXFLAGS//$PREFIX/$BUILD_PREFIX}

# hide host libs
mkdir -p $BUILD_PREFIX/${HOST}
mv $BUILD_PREFIX/${HOST} _hidden

cmake -LAH -G "Ninja" \
-DCMAKE_PREFIX_PATH=${BUILD_PREFIX} \
-DCMAKE_IGNORE_PREFIX_PATH="${PREFIX}" \
-DCMAKE_FIND_FRAMEWORK=LAST \
-DCMAKE_INSTALL_RPATH:STRING=${BUILD_PREFIX}/lib \
-DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-DFEATURE_system_sqlite=ON \
-DFEATURE_framework=OFF \
-DFEATURE_gssapi=OFF \
-DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qttools" \
-DCMAKE_RANLIB=$BUILD_PREFIX/bin/${CONDA_TOOLCHAIN_BUILD}-ranlib \
-DFEATURE_opengl=OFF \
-DFEATURE_linguist=OFF \
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \
-DBUILD_WITH_PCH=OFF \
-B build_native .
cmake --build build_native --target install
mv _hidden $BUILD_PREFIX/${HOST}
)
CMAKE_ARGS="${CMAKE_ARGS} -DQT_HOST_PATH=${BUILD_PREFIX} -DQT_FORCE_BUILD_TOOLS=ON -DQT_REQUIRE_HOST_PATH_CHECK=OFF -DBUILD_WITH_PCH=OFF"

# Error: unknown architecture `nocona' on linux-aarch64
if test "${target_platform}" = "linux-aarch64"
then
CFLAGS=${CFLAGS// -march=nocona/}
CXXFLAGS=${CXXFLAGS// -march=nocona/}
fi
if [[ "$build_platform" != "$target_platform" ]]; then
# This flag is used in conjunction with QT_FORCE_BUILD_TOOLS=ON
# https://github.com/qt/qtbase/commit/acfbe3b7795c741b269fc23ed2c51c5937cd7f4f
export QT_HOST_PATH="$BUILD_PREFIX"
fi

if [[ $(uname) == "Linux" ]]; then
Expand All @@ -62,12 +13,6 @@ if [[ $(uname) == "Linux" ]]; then
CMAKE_ARGS="${CMAKE_ARGS} -DFEATURE_wayland=ON"
fi

if test "${build_platform}" = "linux-64"; then
# In 2023/07/06 we started having trouble with "running out of space"
# on azure for linux64 builds, then linux-aarch64.
CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_WITH_PCH=OFF"
fi

QT_SUBMODULES="qtbase;\
qtdeclarative;\
qtimageformats;\
Expand All @@ -80,10 +25,12 @@ qtwebchannel;\
qtwebsockets"

cmake -LAH -G "Ninja" ${CMAKE_ARGS} \
-DQT_FORCE_BUILD_TOOLS=ON \
-DCMAKE_PREFIX_PATH=${PREFIX} \
-DCMAKE_FIND_FRAMEWORK=LAST \
-DCMAKE_INSTALL_RPATH:STRING=${PREFIX}/lib \
-DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-DCMAKE_UNITY_BUILD=ON \
-DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-DINSTALL_BINDIR=lib/qt6/bin \
-DINSTALL_PUBLICBINDIR=bin \
-DINSTALL_LIBEXECDIR=lib/qt6 \
Expand Down
Loading
Loading