summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpingplug2018-02-27 10:07:30 +0800
committerpingplug2018-02-27 10:07:30 +0800
commit278b002370a33bdd8f688ff68649179db96d2190 (patch)
tree1f0d9a2e358c9c219f2bc0a0a574b034b5d52444
parentea9583cd343ac463fb0987284fdf7d5319aa536d (diff)
downloadaur-278b002370a33bdd8f688ff68649179db96d2190.tar.gz
use *-w64-mingw32-wine instead of wine
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b08c90b3bc..65035b4ef66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-rust
pkgdesc = rust language prebuilt toolchain with mingw target (mingw-w64)
pkgver = 1.24.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.rust-lang.org/
arch = any
license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index d23a25bb760..c08cad292d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=mingw-w64-rust
_pkgname=rust
pkgver=1.24.0
-pkgrel=1
+pkgrel=2
pkgdesc="rust language prebuilt toolchain with mingw target (mingw-w64)"
arch=('any')
url='https://www.rust-lang.org/'
@@ -52,9 +52,11 @@ build() {
package() {
cd "rustc-$pkgver-src"
+ # rust will build install tools there
unset LDFLAGS
export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+ # TODO: find a way to disable packaging
DESTDIR="$pkgdir" python2 ./x.py install \
src/librustc \
src/libstd \
@@ -95,9 +97,9 @@ package() {
linker = "/usr/bin/i686-w64-mingw32-gcc"
ar = "/usr/i686-w64-mingw32/bin/ar"
EOF
- if pacman -T "wine" ; then
+ if pacman -T "wine" "mingw-w64-cmake>1-18" ; then
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
-runner = "wine"
+runner = "/usr/bin/i686-w64-mingw32-wine"
EOF
fi
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
@@ -113,9 +115,9 @@ EOF
linker = "/usr/bin/x86_64-w64-mingw32-gcc"
ar = "/usr/x86_64-w64-mingw32/bin/ar"
EOF
- if pacman -T "wine" ; then
+ if pacman -T "wine" "mingw-w64-cmake>1-18" ; then
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"
-runner = "wine"
+runner = "/usr/bin/x86_64-w64-mingw32-wine"
EOF
fi
cat << EOF >> "${pkgdir}/opt/${_pkgname}/cargo/config"