Update mingw-w64-qt5-base* for GCC 6.1 rebuild

This commit is contained in:
Martchus 2016-05-13 15:08:12 +02:00
parent cfd95e5c4a
commit a49bea056e
3 changed files with 13 additions and 13 deletions

View File

@ -267,7 +267,7 @@ build() {
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this # libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql
LD_LIBRARY_PATH=`pwd`/lib make LD_LIBRARY_PATH="$PWD/lib" make
fi fi
popd popd
@ -337,9 +337,9 @@ package() {
fi fi
# keeping prl files for base build since qbs seems to need them. # keeping prl files for base build since qbs seems to need them.
if isStatic; then isStatic && rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
fi # remove binaries, strip libs
find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g

View File

@ -17,7 +17,7 @@ isOpenGL() {
pkgname=mingw-w64-qt5-base-static pkgname=mingw-w64-qt5-base-static
pkgver=5.6.0 pkgver=5.6.0
pkgrel=2 pkgrel=3
pkgdesc="A cross-platform application and UI framework (mingw-w64, static)" pkgdesc="A cross-platform application and UI framework (mingw-w64, static)"
! isStatic && arch=('i686' 'x86_64') ! isStatic && arch=('i686' 'x86_64')
isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
@ -267,7 +267,7 @@ build() {
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this # libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql
LD_LIBRARY_PATH=`pwd`/lib make LD_LIBRARY_PATH="$PWD/lib" make
fi fi
popd popd
@ -337,9 +337,9 @@ package() {
fi fi
# keeping prl files for base build since qbs seems to need them. # keeping prl files for base build since qbs seems to need them.
if isStatic; then isStatic && rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
fi # remove binaries, strip libs
find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g

View File

@ -267,7 +267,7 @@ build() {
# libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap*
# libraries aren't installed at this point yet, we have to workaround this # libraries aren't installed at this point yet, we have to workaround this
../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql
LD_LIBRARY_PATH=`pwd`/lib make LD_LIBRARY_PATH="$PWD/lib" make
fi fi
popd popd
@ -337,9 +337,9 @@ package() {
fi fi
# keeping prl files for base build since qbs seems to need them. # keeping prl files for base build since qbs seems to need them.
if isStatic; then isStatic && rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
fi # remove binaries, strip libs
find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm
find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g