From 6face8aef30195f0800623e38e60c460c3db0876 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 6 Dec 2019 15:09:51 +0100 Subject: [PATCH] Use flags from mingw-w64-environment for mingw-w64-qt5-base --- qt5-base/mingw-w64-angle/PKGBUILD | 9 +++------ qt5-base/mingw-w64-opengl/PKGBUILD | 9 +++------ qt5-base/mingw-w64-static/PKGBUILD | 11 ++++------- qt5-base/mingw-w64/PKGBUILD | 9 +++------ 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index 115aed2e..e44d2661 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -47,7 +47,7 @@ optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick' 'mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' - 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config') + 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment') # For running fxc.exe WINE coulde be used: #if isANGLE || isDynamic; then # makedepends+=('mingw-w64-wine') @@ -152,12 +152,9 @@ prepare() { # make sure the Qt 5 build system uses our external PCRE library and zlib rm -rf src/3rdparty/{pcre,zlib} - # build qmake using mingw-w64 {C,LD}FLAGS + # build qmake using mingw-w64 {C,CXX,LD}FLAGS # This also sets default {C,CXX,LD}FLAGS for projects built using qmake - CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}" - 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}" - LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}" + source mingw-env sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \ -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \ -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \ diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index 6a3f1869..a89f2d6c 100644 --- a/qt5-base/mingw-w64-opengl/PKGBUILD +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -47,7 +47,7 @@ optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick' 'mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' - 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config') + 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment') # For running fxc.exe WINE coulde be used: #if isANGLE || isDynamic; then # makedepends+=('mingw-w64-wine') @@ -152,12 +152,9 @@ prepare() { # make sure the Qt 5 build system uses our external PCRE library and zlib rm -rf src/3rdparty/{pcre,zlib} - # build qmake using mingw-w64 {C,LD}FLAGS + # build qmake using mingw-w64 {C,CXX,LD}FLAGS # This also sets default {C,CXX,LD}FLAGS for projects built using qmake - CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}" - 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}" - LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}" + source mingw-env sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \ -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \ -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \ diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 4af7e3f6..25f92ec4 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -33,7 +33,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-static pkgver=5.13.2 -pkgrel=1 +pkgrel=2 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 isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -47,7 +47,7 @@ optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick' 'mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' - 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config') + 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment') # For running fxc.exe WINE coulde be used: #if isANGLE || isDynamic; then # makedepends+=('mingw-w64-wine') @@ -152,12 +152,9 @@ prepare() { # make sure the Qt 5 build system uses our external PCRE library and zlib rm -rf src/3rdparty/{pcre,zlib} - # build qmake using mingw-w64 {C,LD}FLAGS + # build qmake using mingw-w64 {C,CXX,LD}FLAGS # This also sets default {C,CXX,LD}FLAGS for projects built using qmake - CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}" - 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}" - LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}" + source mingw-env sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \ -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \ -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \ diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 6cd55f55..dfe4fe41 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -47,7 +47,7 @@ optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick' 'mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' - 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config') + 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment') # For running fxc.exe WINE coulde be used: #if isANGLE || isDynamic; then # makedepends+=('mingw-w64-wine') @@ -152,12 +152,9 @@ prepare() { # make sure the Qt 5 build system uses our external PCRE library and zlib rm -rf src/3rdparty/{pcre,zlib} - # build qmake using mingw-w64 {C,LD}FLAGS + # build qmake using mingw-w64 {C,CXX,LD}FLAGS # This also sets default {C,CXX,LD}FLAGS for projects built using qmake - CPPFLAGS="${MINGW_CPPFLAGS:--D_FORTIFY_SOURCE=2}" - 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}" - LDFLAGS="${MINGW_LDFLAGS:--Wl,-O1,--sort-common,--as-needed -fstack-protector}" + source mingw-env sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*=\).*$|\1 ${CFLAGS}|" \ -e "s|^\(QMAKE_CXXFLAGS_RELEASE.*=\).*$|\1 ${CXXFLAGS}|" \ -e "s|^\(QMAKE_LFLAGS_RELEASE.*=\).*$|\1 ${LDFLAGS}|" \