Use flags from mingw-w64-environment for mingw-w64-qt5-base
This commit is contained in:
parent
5afcec27c3
commit
6face8aef3
|
|
@ -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}|" \
|
||||
|
|
|
|||
|
|
@ -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}|" \
|
||||
|
|
|
|||
|
|
@ -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}|" \
|
||||
|
|
|
|||
|
|
@ -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}|" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue