Don't add symlinks for tools in mingw-w64-qt5-tools-static

to prevent conflict with mingw-w64-qt5-tools

qt5-tools/mingw-w64-static/PKGBUILD

@@ -24,7 +24,7 @@
 _qt_module=qttools
 pkgname=mingw-w64-qt5-tools-static
 pkgver=5.15.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
@@ -117,11 +117,6 @@ package() {
         find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
       find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
 
-      # create symlinks for tools
-      mkdir -p "${pkgdir}/usr/bin"
-      for tool in lconvert lupdate lrelease windeployqt; do
-        ln -sf "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-$tool-qt5"
-      done
       popd
     done
 

qt5-tools/mingw-w64-static/PKGBUILD.sh.ep

@@ -1 +1 @@
-%= include "$default_package_name/mingw-w64/PKGBUILD";
+%= include "$default_package_name/mingw-w64/PKGBUILD", pkgrel => '2';

qt5-tools/mingw-w64/PKGBUILD.sh.ep

@@ -19,7 +19,7 @@
 % end
 \
 pkgver=5.15.1
-pkgrel=1
+pkgrel=<%== stash('pkgrel') // '1' %>
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
 depends=(<%== qt5deps qw(declarative) %>)
@@ -32,11 +32,13 @@ CONFIG+=no_smart_library_merge QTPLUGIN.sqldrivers=qsqlite QTPLUGIN.sqldrivers+=
 \
 % content_for package_config => begin
 
+% unless ($static_variant) {
       # create symlinks for tools
       mkdir -p "${pkgdir}/usr/bin"
       for tool in lconvert lupdate lrelease windeployqt; do
         ln -sf "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-$tool-qt5"
       done
+% }
 % end
 \
 % content_for package => begin