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.

Sign up for GitHub

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

Jump to bottom

[Qt6Base] Targets build for v6.3.5 #7628

Merged
merged 5 commits into from
Nov 6, 2023
Merged

[Qt6Base] Targets build for v6.3.5 #7628

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb531b1
[Qt6Base] Targets build for v6.3.5
barche Nov 5, 2023
17bf265
Fix host LD_LIBRARY_PATH
barche Nov 5, 2023
c25aa8d
Don't link OpenSSL on Windows
barche Nov 5, 2023
814ea18
[Qt6Base] Adjust LDFLAGS for x86_64 win
giordano Nov 6, 2023
56d39ac
Revert "[Qt6Base] Adjust LDFLAGS for x86_64 win"
giordano Nov 6, 2023
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
6 changes: 3 additions & 3 deletions Q/Qt6Base/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = v"6.5.3"
# Set this to true first when updating the version. It will build only for the host (linux musl).
# After that JLL is in the registyry, set this to false to build for the other platforms, using
# this same package as host build dependency.
const host_build = true
const host_build = false

# Collection of sources required to build qt6
sources = [
Expand Down Expand Up @@ -40,7 +40,7 @@ commonoptions=" \

commoncmakeoptions="-DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DQT_HOST_PATH=$host_prefix -DQT_FEATURE_openssl_linked=ON"

export LD_LIBRARY_PATH=$host_libdir:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$host_libdir:$host_prefix/lib64:$LD_LIBRARY_PATH
export OPENSSL_LIBS="-L${libdir} -lssl -lcrypto"

# temporarily allow march during configure
Expand Down Expand Up @@ -76,7 +76,7 @@ case "$bb_full_target" in
make install

cd $WORKSPACE/srcdir/build
../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -opengl dynamic -- $commoncmakeoptions
../qtbase-everywhere-src-*/configure -prefix $prefix -opensource -confirm-license -nomake examples -release -opengl dynamic -- -DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DQT_HOST_PATH=$host_prefix
;;

*apple-darwin*)
Expand Down