summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2019-12-02 21:47:04 +0100
committerMichel Zou2019-12-02 21:47:04 +0100
commit38d82386d30186290e5ee2303029fbfb10b71485 (patch)
tree0602a186bfec20f445f62fef36a67f4b24243414
parent24fca81db6e22abeb5f8b5d05a5605e5e1fbd585 (diff)
downloadaur-38d82386d30186290e5ee2303029fbfb10b71485.tar.gz
mingw-w64-environment
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
-rw-r--r--mingw-cmake.sh10
3 files changed, 7 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a555e6b6f8f..778d8643757 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = mingw-w64-cmake
pkgdesc = CMake wrapper for MinGW (mingw-w64)
pkgver = 1
- pkgrel = 32
+ pkgrel = 33
url = http://fedoraproject.org/wiki/MinGW
arch = any
license = GPL
depends = cmake
depends = mingw-w64-gcc
depends = mingw-w64-pkg-config
+ depends = mingw-w64-environment
optdepends = mingw-w64-wine: runtime support
source = mingw-cmake.sh
source = mingw-cmake-py.sh
diff --git a/PKGBUILD b/PKGBUILD
index b129cac351c..2d5371dc279 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
pkgname=mingw-w64-cmake
pkgver=1
-pkgrel=32
+pkgrel=33
arch=('any')
pkgdesc="CMake wrapper for MinGW (mingw-w64)"
-depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
+depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-environment')
optdepends=('mingw-w64-wine: runtime support')
license=("GPL")
url="http://fedoraproject.org/wiki/MinGW"
diff --git a/mingw-cmake.sh b/mingw-cmake.sh
index adb9dd7e732..886f0a126cc 100644
--- a/mingw-cmake.sh
+++ b/mingw-cmake.sh
@@ -1,14 +1,10 @@
#!/bin/sh
-mingw_prefix=/usr/@TRIPLE@
-export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig"
+source mingw-env @TRIPLE@
-default_mingw_compiler_flags="-D_FORTIFY_SOURCE=2 -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4"
-default_mingw_linker_flags="-Wl,-O1,--sort-common,--as-needed -fstack-protector"
+mingw_prefix=/usr/@TRIPLE@
-export CFLAGS="${MINGW_CFLAGS:-$default_mingw_compiler_flags $CFLAGS}"
-export CXXFLAGS="${MINGW_CXXFLAGS:-$default_mingw_compiler_flags $CXXFLAGS}"
-export LDFLAGS="${MINGW_LDFLAGS:-$default_mingw_linker_flags $LDFLAGS}"
+export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig"
PATH=${mingw_prefix}/bin:$PATH cmake \
-DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \