fix: arrow-ext installation through pie (#2273)

* fix: arrow-ext installation through pie

* fix: makefile.frag

Author: norberttech

src/extension/arrow-ext/ext/Makefile.frag

@@ -0,0 +1,16 @@
+# Build the actual extension via Cargo (Rust) and replace the dummy .so
+# This runs after PHP's build system compiles the dummy arrow.c
+
+ARROW_CARGO_DIR = $(srcdir)/..
+
+all: cargo_build_arrow
+
+.PHONY: cargo_build_arrow
+cargo_build_arrow: $(phplibdir)/arrow.so
+	cd "$(ARROW_CARGO_DIR)" && PHP_CONFIG="$$(which php-config)" PHP="$$(which php)" cargo build --release
+	@if [ "$$(uname)" = "Darwin" ]; then \
+		cp "$(ARROW_CARGO_DIR)/target/release/libarrow.dylib" "$(phplibdir)/arrow.so"; \
+	else \
+		cp "$(ARROW_CARGO_DIR)/target/release/libarrow.so" "$(phplibdir)/arrow.so"; \
+	fi
+	@echo "Replaced dummy arrow.so with Rust-built extension"

src/extension/arrow-ext/ext/config.m4

@@ -1,5 +1,4 @@
 dnl config.m4 for extension arrow (Rust-based via ext-php-rs)
-dnl This is a best-effort PIE compatibility shim delegating to cargo
 
 PHP_ARG_ENABLE([arrow],
   [whether to enable arrow support],
@@ -8,41 +7,37 @@ PHP_ARG_ENABLE([arrow],
 
 if test "$PHP_ARROW" != "no"; then
   AC_MSG_CHECKING([for cargo (Rust build tool)])
-  AC_PATH_PROG(CARGO, cargo, no)
-  if test "$CARGO" = "no"; then
+  AC_PATH_PROG(CARGO, cargo)
+  if test -z "$CARGO"; then
+    RUSTUP_CARGO=$(rustup which cargo 2>/dev/null)
+    if test -n "$RUSTUP_CARGO"; then
+      CARGO=$RUSTUP_CARGO
+    fi
+  fi
+  if test -z "$CARGO"; then
     AC_MSG_ERROR([cargo is required to build the arrow extension. Install Rust from https://rustup.rs/])
   fi
   AC_MSG_RESULT([$CARGO])
 
-  dnl Build via cargo in the parent directory (where Cargo.toml lives)
-  EXT_DIR=$(pwd)
-  ARROW_SRC_DIR=$(dirname "$EXT_DIR")
-
-  AC_MSG_NOTICE([Building arrow extension via cargo...])
-  (cd "$ARROW_SRC_DIR" && $CARGO build --release) || AC_MSG_ERROR([cargo build failed])
-
-  dnl Detect the built library
-  case $host_os in
-    darwin*)
-      ARROW_LIB="$ARROW_SRC_DIR/target/release/libarrow.dylib"
-      ;;
-    *)
-      ARROW_LIB="$ARROW_SRC_DIR/target/release/libarrow.so"
-      ;;
-  esac
-
-  if test ! -f "$ARROW_LIB"; then
-    AC_MSG_ERROR([Built library not found at $ARROW_LIB])
+  AC_MSG_CHECKING([for rustc (Rust compiler)])
+  AC_PATH_PROG(RUSTC, rustc)
+  if test -z "$RUSTC"; then
+    RUSTUP_RUSTC=$(rustup which rustc 2>/dev/null)
+    if test -n "$RUSTUP_RUSTC"; then
+      RUSTC=$RUSTUP_RUSTC
+    fi
   fi
-
-  dnl Copy built library to expected location
-  mkdir -p "$EXT_DIR/modules"
-  cp "$ARROW_LIB" "$EXT_DIR/modules/arrow.so"
+  if test -z "$RUSTC"; then
+    AC_MSG_ERROR([rustc is required to build the arrow extension. Install Rust from https://rustup.rs/])
+  fi
+  AC_MSG_RESULT([$RUSTC])
 
   dnl Create a dummy C file so phpize/configure infrastructure does not complain
-  if test ! -f "$EXT_DIR/arrow.c"; then
-    echo "/* Dummy - actual extension built by Rust/cargo */" > "$EXT_DIR/arrow.c"
+  ARROW_EXT_DIR=$(pwd)
+  if test ! -f "$ARROW_EXT_DIR/arrow.c"; then
+    echo "/* Dummy - actual extension built by Rust/cargo */" > "$ARROW_EXT_DIR/arrow.c"
   fi
 
   PHP_NEW_EXTENSION(arrow, arrow.c, $ext_shared)
+  PHP_ADD_MAKEFILE_FRAGMENT
 fi