summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2018-09-03 16:13:42 +0200
committerNicola Murino2018-09-03 17:04:38 +0200
commit3c2ce2fcba23b974db94db7e2294cbae0a903568 (patch)
tree2bf49d9fe8b592bff0f767eb8f6f64b3b5e78d49
parent7a1e04529430877f034b732bb692ed4f6443b902 (diff)
downloadaur-3c2ce2fcba23b974db94db7e2294cbae0a903568.tar.gz
Use gcc-ar instead of ar
Prevents issues like: ``` i686-w64-mingw32-ar: glib/glib@@glib-2.0@sha/glist.c.obj: plugin needed to handle lto object ```
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--toolchain-mingw.meson2
3 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ab4cb03cafe..21c03c0e43a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jun 13 20:39:13 UTC 2018
pkgbase = mingw-w64-meson
pkgdesc = Meson wrapper for MinGW (mingw-w64)
pkgver = 1
- pkgrel = 7
+ pkgrel = 8
url = http://fedoraproject.org/wiki/MinGW
arch = any
license = GPL
@@ -13,7 +11,7 @@ pkgbase = mingw-w64-meson
optdepends = mingw-w64-wine: Set NEED_WINE env variable in your PKGBUILD to use wine support in meson
source = toolchain-mingw.meson
source = meson-mingw-wrapper
- sha256sums = e9ed0a02b0f6ef00f76b2e41d02f2cc486355f9799072a3c6267fefcbf48b110
+ sha256sums = 4ba3d46e1eb976b69f47b58edc51de1d01aba7362a18ec0715e1d209601f5a96
sha256sums = d02f4469567104c03d908b1eb7cd2093342bf84b58bd2dc458e33ffd708b5ccb
pkgname = mingw-w64-meson
diff --git a/PKGBUILD b/PKGBUILD
index 8a06957dda08..d5e57cfa5474 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: drakkan <nicola.murino at gmail dot com>
pkgname=mingw-w64-meson
pkgver=1
-pkgrel=7
+pkgrel=8
arch=('any')
pkgdesc="Meson wrapper for MinGW (mingw-w64)"
depends=('meson' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
@@ -10,7 +10,7 @@ license=("GPL")
url="http://fedoraproject.org/wiki/MinGW"
source=("toolchain-mingw.meson"
"meson-mingw-wrapper")
-sha256sums=('e9ed0a02b0f6ef00f76b2e41d02f2cc486355f9799072a3c6267fefcbf48b110'
+sha256sums=('4ba3d46e1eb976b69f47b58edc51de1d01aba7362a18ec0715e1d209601f5a96'
'd02f4469567104c03d908b1eb7cd2093342bf84b58bd2dc458e33ffd708b5ccb')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/toolchain-mingw.meson b/toolchain-mingw.meson
index 8aed5b092825..be6a8d59cef4 100644
--- a/toolchain-mingw.meson
+++ b/toolchain-mingw.meson
@@ -2,7 +2,7 @@
c = '@TRIPLE@-gcc'
cpp = '@TRIPLE@-g++'
fortran = '@TRIPLE@-gfortran'
-ar = '@TRIPLE@-ar'
+ar = '@TRIPLE@-gcc-ar'
pkgconfig = '@TRIPLE@-pkg-config'
ranlib = '@TRIPLE@-ranlib'
strip = '@TRIPLE@-strip'