global: Fix PKGBUILD

Alexpux · Feb 26, 2018 · 8cab025 · 8cab025
1 parent e3ab46f
commit 8cab025
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...w-w64-global/001-global-6.6.2-mingw64.txt → ...w64-global/001-global-6.6.2-mingw64.patch b/...w-w64-global/001-global-6.6.2-mingw64.txt → ...w64-global/001-global-6.6.2-mingw64.patch
diff --git a/mingw-w64-global/PKGBUILD b/mingw-w64-global/PKGBUILD
@@ -12,8 +12,7 @@ license=('GPL3')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-ncurses")
 
 source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"
-	'001-global-6.6.2-mingw64.txt'
-	)
+        '001-global-6.6.2-mingw64.patch')
 sha256sums=('ca1dc15e9f320983e4d53ccb947ce58729952728273fdf415ab309ea2c0cd7fa'
             '2bb92dd9c93ebd26913b3cd768a5f2f0a7f5d6367a19f05323f9b89ec84e492e')
 
@@ -22,18 +21,22 @@ _global_srcdir=${_realname}-${pkgver}
 prepare() {
   cd ${_global_srcdir}
 
-  patch -p1 -i ${srcdir}/001-global-6.6.2-mingw64.txt
+  patch -p1 -i ${srcdir}/001-global-6.6.2-mingw64.patch
   autoconf
 
   rm -rf "${srcdir}"/build-${CARCH}
 }
 
 build() {
-  cd ${srcdir} && mkdir build-${CARCH} && cd build-${CARCH}
+  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
+  mkdir build-${CARCH} && cd build-${CARCH}
   export CPPFLAGS="-I${MINGW_PREFIX}/include/ncurses"
 
   ../${_global_srcdir}/configure \
     --prefix=${MINGW_PREFIX} \
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST} \
     --with-ncurses=${MINGW_PREFIX}
 
   make