Skip to content

Commit

Permalink
[Qt6Base] Targets build for v6.3.5 (#7628)
Browse files Browse the repository at this point in the history
* [Qt6Base] Targets build for v6.3.5

* Fix host LD_LIBRARY_PATH

* Don't link OpenSSL on Windows

* [Qt6Base] Adjust LDFLAGS for x86_64 win

* Revert "[Qt6Base] Adjust LDFLAGS for x86_64 win"

This reverts commit 814ea18.

---------

Co-authored-by: Mosè Giordano <mose@gnu.org>
  • Loading branch information
barche and giordano authored Nov 6, 2023
1 parent b524ac3 commit bca4972
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Q/Qt6Base/build_tarballs.jl
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

0 comments on commit bca4972

Please sign in to comment.