binfmt

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c6ec3b79517..520b63e72fcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Jun  2 07:43:43 UTC 2018
+# Sat Jun  2 10:56:02 UTC 2018
 pkgbase = mingw-w64-hdf5
 	pkgdesc = General purpose library and file format for storing scientific data (mingw-w64)
 	pkgver = 1.10.2
diff --git a/PKGBUILD b/PKGBUILD
index eb01c9ccf897..622104ba0293 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ prepare () {
   cd "$srcdir/hdf5-${pkgver/_/-}"
 
   # run H5detect.exe, H5make_libsettings.exe through wine
-  sed "s|set (CMD $<TARGET_FILE:H5|set (CMD /usr/bin/@ARCH@-wine $<TARGET_FILE:H5|g" src/CMakeLists.txt > src/CMakeLists.txt.in
+  cp src/CMakeLists.txt src/CMakeLists.txt.orig
 
   # do not use msvc import suffix
   sed -i "s|MINGW AND \${libtype} MATCHES \"SHARED\"|0|g" config/cmake_ext_mod/HDFMacros.cmake
@@ -40,10 +40,9 @@ prepare () {
 }
 
 build() {
-  cd "$srcdir"
+  cd "$srcdir/hdf5-${pkgver/_/-}"
   for _arch in $_architectures; do
-    cp -r hdf5-${pkgver/_/-} hdf5-${_arch} && pushd hdf5-${_arch}
-    sed "s|@ARCH@|${_arch}|g" src/CMakeLists.txt.in > src/CMakeLists.txt
+    sed "s|COMMAND \$<TARGET_FILE:H5|COMMAND /usr/bin/${_arch}-wine \$<TARGET_FILE:H5|g" src/CMakeLists.txt.orig > src/CMakeLists.txt
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
       -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
@@ -53,7 +52,6 @@ build() {
       ..
     make
     popd
-    popd
   done
 }