diff --git a/qt6-tools/static-compat/PKGBUILD b/qt6-tools/static-compat/PKGBUILD index c27f8d36..b7772965 100644 --- a/qt6-tools/static-compat/PKGBUILD +++ b/qt6-tools/static-compat/PKGBUILD @@ -6,7 +6,7 @@ pkgname=static-compat-qt6-tools _qtver=6.4.2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -70,7 +70,7 @@ build() { -DLLVM_DIR="$PWD/prefix/lib/cmake/llvm" \ -DClang_DIR="$PWD/prefix/lib/cmake/clang" # ensure system libc/libdl/libm is present on the linker-line before other libs - sed -i -E 's|(LINK_LIBRARIES = )(.*libLLVM-14.so.*)|\1/usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libmvec.so.1 /usr/lib/libdl.so.2 /usr/lib/libc.so.6 \2|g' build/build.ninja + sed -i -E 's|(LINK_LIBRARIES = )(.*libLLVM-15.so.*)|\1/usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libmvec.so.1 /usr/lib/libdl.so.2 /usr/lib/libc.so.6 \2|g' build/build.ninja VERBOSE=1 cmake --build build } diff --git a/qt6-tools/static-compat/PKGBUILD.sh.ep b/qt6-tools/static-compat/PKGBUILD.sh.ep index 443c2b65..319ddc6d 100644 --- a/qt6-tools/static-compat/PKGBUILD.sh.ep +++ b/qt6-tools/static-compat/PKGBUILD.sh.ep @@ -2,7 +2,7 @@ \ _qtver=6.4.2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) @@ -39,5 +39,5 @@ optdepends=('clang: for qdoc and lupdate') -DLLVM_DIR="$PWD/prefix/lib/cmake/llvm" \\ -DClang_DIR="$PWD/prefix/lib/cmake/clang" # ensure system libc/libdl/libm is present on the linker-line before other libs - sed -i -E 's|(LINK_LIBRARIES = )(.*libLLVM-14.so.*)|\1/usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libmvec.so.1 /usr/lib/libdl.so.2 /usr/lib/libc.so.6 \2|g' build/build.ninja\ + sed -i -E 's|(LINK_LIBRARIES = )(.*libLLVM-15.so.*)|\1/usr/lib/libpthread.so.0 /usr/lib/libm.so.6 /usr/lib/libmvec.so.1 /usr/lib/libdl.so.2 /usr/lib/libc.so.6 \2|g' build/build.ninja\ % end