Change flags in mingw-w64-qt5-* for mingw-w64 7.0.0
* Prevent `undefined reference to `__memcpy_chk'` * Be consistent with https://aur.archlinux.org/cgit/aur.git/commit/?h=mingw-w64-configure&id=c2ee2d12aa95d15dde2f3125a75a08b1622bfb73 * Rebuild qtdeclarative as well to check whether we can build dynamically and statically linked executables * See https://github.com/Martchus/PKGBUILDs/issues/105
This commit is contained in:
parent
1e537240ec
commit
4972f27236
|
@ -33,7 +33,7 @@ isNoOpenGL() {
|
||||||
|
|
||||||
pkgname=mingw-w64-qt5-base-angle
|
pkgname=mingw-w64-qt5-base-angle
|
||||||
pkgver=5.13.2
|
pkgver=5.13.2
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
||||||
# The static variant doesn't contain any executables which need to be executed on the build machine
|
# The static variant doesn't contain any executables which need to be executed on the build machine
|
||||||
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
||||||
|
@ -157,7 +157,7 @@ prepare() {
|
||||||
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
||||||
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
|
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}"
|
||||||
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
||||||
|
|
|
@ -33,7 +33,7 @@ isNoOpenGL() {
|
||||||
|
|
||||||
pkgname=mingw-w64-qt5-base-opengl
|
pkgname=mingw-w64-qt5-base-opengl
|
||||||
pkgver=5.13.2
|
pkgver=5.13.2
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
||||||
# The static variant doesn't contain any executables which need to be executed on the build machine
|
# The static variant doesn't contain any executables which need to be executed on the build machine
|
||||||
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
||||||
|
@ -157,7 +157,7 @@ prepare() {
|
||||||
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
||||||
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
|
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}"
|
||||||
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
||||||
|
|
|
@ -157,7 +157,7 @@ prepare() {
|
||||||
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
||||||
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
|
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}"
|
||||||
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
||||||
|
|
|
@ -33,7 +33,7 @@ isNoOpenGL() {
|
||||||
|
|
||||||
pkgname=mingw-w64-qt5-base
|
pkgname=mingw-w64-qt5-base
|
||||||
pkgver=5.13.2
|
pkgver=5.13.2
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
pkgdesc='A cross-platform application and UI framework (mingw-w64)'
|
||||||
# The static variant doesn't contain any executables which need to be executed on the build machine
|
# The static variant doesn't contain any executables which need to be executed on the build machine
|
||||||
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
isStatic && arch=('any') || arch=('i686' 'x86_64')
|
||||||
|
@ -157,7 +157,7 @@ prepare() {
|
||||||
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}"
|
||||||
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CFLAGS="${MINGW_CFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
CXXFLAGS="${MINGW_CXXFLAGS:-$CPPFLAGS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4}"
|
||||||
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed}"
|
LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}"
|
||||||
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
-e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \
|
||||||
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
-e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
_qt_module=qtdeclarative
|
_qt_module=qtdeclarative
|
||||||
pkgname=mingw-w64-qt5-declarative
|
pkgname=mingw-w64-qt5-declarative
|
||||||
pkgver=5.13.2
|
pkgver=5.13.2
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
|
pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
|
||||||
depends=('mingw-w64-qt5-base')
|
depends=('mingw-w64-qt5-base')
|
||||||
|
|
Loading…
Reference in New Issue