From 559e6fd608e7dd57280efe217a18d96a4bbdf5cb Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Wed, 17 Jul 2024 13:11:22 +0000
Subject: [PATCH] arrow: Use build system options to use out-of-tree build
 directory

---
 mingw-w64-arrow/PKGBUILD | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/mingw-w64-arrow/PKGBUILD b/mingw-w64-arrow/PKGBUILD
index 177ce9945e..43491c9e2e 100644
--- a/mingw-w64-arrow/PKGBUILD
+++ b/mingw-w64-arrow/PKGBUILD
@@ -4,7 +4,7 @@ _realname=arrow
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=17.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -70,8 +70,6 @@ validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B'
               'AF6AADA4C9835B75973FF5DA275C532289DD0F4A')
 
 build() {
-  mkdir -p "${srcdir}"/build-${MSYSTEM}-cpp && cd "${srcdir}"/build-${MSYSTEM}-cpp
-
   if check_option "debug" "n"; then
     export _cmake_build_type="Release"
   else
@@ -110,11 +108,10 @@ build() {
       -DPARQUET_BUILD_EXECUTABLES=ON \
       -DPARQUET_REQUIRE_ENCRYPTION=ON \
       -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
-      ../apache-${_realname}-${pkgver}/cpp \
+      -S "apache-${_realname}-${pkgver}/cpp" \
+      -B "build-${MSYSTEM}-cpp"
 
-  ${MINGW_PREFIX}/bin/cmake --build .
-
-  mkdir -p "${srcdir}"/build-${MSYSTEM}-c-glib && cd "${srcdir}"/build-${MSYSTEM}-c-glib
+  ${MINGW_PREFIX}/bin/cmake --build "build-${MSYSTEM}-cpp"
 
   declare -a _meson_extra_config
   if check_option "debug" "n"; then
@@ -128,21 +125,20 @@ build() {
     --prefix=${MINGW_PREFIX} \
     "${_meson_extra_config[@]}" \
     -Darrow_cpp_build_dir="${srcdir}"/build-${MSYSTEM}-cpp \
-    -Darrow_cpp_build_type=${_cmake_build_type} \
+    -Darrow_cpp_build_type="${_cmake_build_type}" \
     -Dgtk_doc=true \
-    ../apache-${_realname}-${pkgver}/c_glib
-
-  sed -i'' -s 's/\r//g' arrow-glib/version.h
+    "build-${MSYSTEM}-c-glib" \
+    "apache-${_realname}-${pkgver}/c_glib"
 
   PATH="${srcdir}"/build-${MSYSTEM}-cpp/${_cmake_build_type}:$PATH \
-    ${MINGW_PREFIX}/bin/meson compile
+    ${MINGW_PREFIX}/bin/meson compile -C "build-${MSYSTEM}-c-glib"
 }
 
 package() {
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM}-cpp
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "build-${MSYSTEM}-cpp"
 
   PATH="${srcdir}"/build-${MSYSTEM}-c-glib/arrow-glib:"${srcdir}"/build-${MSYSTEM}-cpp/${_cmake_build_type}:$PATH \
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install -C build-${MSYSTEM}-c-glib
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install -C "build-${MSYSTEM}-c-glib"
 
   # Remove full path reference
   local _PREFIX_WIN="$(cygpath -wm ${MINGW_PREFIX})"