diff --git a/mingw-w64-lapack/PKGBUILD b/mingw-w64-lapack/PKGBUILD index b213e983e7..85a318450b 100644 --- a/mingw-w64-lapack/PKGBUILD +++ b/mingw-w64-lapack/PKGBUILD @@ -16,47 +16,38 @@ url="http://www.netlib.org/lapack" source=("http://www.netlib.org/${_realname}/${_realname}-${pkgver}.tgz") sha256sums=('a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3') -build() -{ - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null - +build() { cd "$srcdir" mkdir -p build-${CARCH} && cd build-${CARCH} - ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ - -DCMAKE_Fortran_COMPILER:PATH=${PREFIX_DEPS}/bin/gfortran.exe \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_NEED_RESPONSE=ON \ - -DBUILD_TESTING=OFF \ - ../${_realname}-${pkgver} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G"MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_Fortran_COMPILER=${MINGW_PREFIX}/bin/gfortran.exe \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_NEED_RESPONSE=ON \ + -DBUILD_TESTING=OFF \ + ../${_realname}-${pkgver} make cd "$srcdir" mkdir -p build-${CARCH}s && cd build-${CARCH}s - ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ - -DCMAKE_Fortran_COMPILER:PATH=${PREFIX_DEPS}/bin/gfortran.exe \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_TESTING=OFF \ - ../${_realname}-${pkgver} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G"MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_Fortran_COMPILER=${MINGW_PREFIX}/bin/gfortran.exe \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_TESTING=OFF \ + ../${_realname}-${pkgver} make } -package() -{ +package() { cd "$srcdir/build-${CARCH}s" - make install # DESTDIR="$pkgdir" + make DESTDIR="$pkgdir" install cd "$srcdir/build-${CARCH}" - make install # DESTDIR="$pkgdir" + make DESTDIR="$pkgdir" install }