9.3.0

1 files changed, 18 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6f35d76f3ee2..98656edeaf32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,5 @@
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
-
-_targets="i686-w64-mingw32 x86_64-w64-mingw32"
-
 pkgname=mingw-w64-gcc
-pkgver=9.2.0
+pkgver=9.3.0
 _islver=0.21
 pkgrel=1
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
@@ -15,7 +10,7 @@ groups=('mingw-w64-toolchain' 'mingw-w64')
 depends=('zlib' 'libmpc'
 	 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads'
 	 'mingw-w64-headers')
-makedepends=("gcc-ada")
+makedepends=("gcc-ada>=${pkgver:0:1}")
 optdepends=()
 provides=('mingw-w64-gcc-base')
 replaces=()
@@ -27,10 +22,12 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206'
+sha256sums=('71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1'
             'SKIP'
             'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
 
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 prepare() {
   ln -sf gcc-${pkgver/+/-} gcc
   cd gcc
@@ -40,11 +37,12 @@ prepare() {
 }
 
 build() {
-  for _target in ${_targets}; do
-    mkdir -p "$srcdir"/gcc-build-${_target} && cd "$srcdir"/gcc-build-${_target}
-
+  for _arch in ${_architectures}; do
+    mkdir -p "$srcdir"/build-${_arch} && cd "$srcdir"/build-${_arch}
     "$srcdir"/gcc/configure --prefix=/usr --libexecdir=/usr/lib \
-        --target=${_target} \
+        --target=${_arch} \
+        --with-pkgversion="Arch Linux $pkgver-$pkgrel" \
+        --with-bugurl=https://bugs.archlinux.org/ \
         --enable-languages=c,lto,c++,objc,obj-c++,fortran,ada \
         --enable-shared --enable-static \
         --enable-threads=posix --enable-fully-dynamic-string \
@@ -57,16 +55,16 @@ build() {
 }
 
 package() {
-  for _target in ${_targets}; do
-    cd "$srcdir"/gcc-build-${_target}
+  for _arch in ${_architectures}; do
+    cd "$srcdir"/build-${_arch}
     make DESTDIR="$pkgdir" install
-    ${_target}-strip "$pkgdir"/usr/${_target}/lib/*.dll
-    strip "$pkgdir"/usr/bin/${_target}-*
-    strip "$pkgdir"/usr/lib/gcc/${_target}/${pkgver:0:5}/{cc1*,collect2,gnat1,f951,lto*}
-    ln -s ${_target}-gcc "$pkgdir"/usr/bin/${_target}-cc
+    ${_arch}-strip "$pkgdir"/usr/${_arch}/lib/*.dll
+    strip "$pkgdir"/usr/bin/${_arch}-*
+    strip "$pkgdir"/usr/lib/gcc/${_arch}/${pkgver:0:5}/{cc1*,collect2,gnat1,f951,lto*}
+    ln -s ${_arch}-gcc "$pkgdir"/usr/bin/${_arch}-cc
     # mv dlls
-    mkdir -p "$pkgdir"/usr/${_target}/bin/
-    mv "$pkgdir"/usr/${_target}/lib/*.dll "$pkgdir"/usr/${_target}/bin/
+    mkdir -p "$pkgdir"/usr/${_arch}/bin/
+    mv "$pkgdir"/usr/${_arch}/lib/*.dll "$pkgdir"/usr/${_arch}/bin/
   done
   strip "$pkgdir"/usr/bin/*
   # remove unnecessary files