diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 2 | ||||
| -rw-r--r-- | patches/php-8.1.10_pre.local.patch | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 073f6c71..9eb258d3 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -389,7 +389,7 @@ have_shm_mmap_posix=yes"}; : ${PKG_PHP_ENV_VARS_EXTRA:="HOST_CC=gcc:READLINE_DIR=${PREFIX_NATIVE}/include/readline"}; : ${PKG_PHP_LIBTOOL:=rdlibtool}; : ${PKG_PHP_MAKEFLAGS_BUILD:=-j1}; -: ${PKG_PHP_MAKEFLAGS_INSTALL_EXTRA:="prefix=${PREFIX_NATIVE}"}; +: ${PKG_PHP_INSTALL_FILES_V2:="+../obj/libs/libphp.so=lib/%[FNAME]"}; : ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1}; : ${PKG_POPT_VERSION:=1.18}; : ${PKG_POPT_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-${PKG_POPT_VERSION}.tar.gz}; diff --git a/patches/php-8.1.10_pre.local.patch b/patches/php-8.1.10_pre.local.patch index dda9bf5b..b3bb7dc5 100644 --- a/patches/php-8.1.10_pre.local.patch +++ b/patches/php-8.1.10_pre.local.patch @@ -40,6 +40,15 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure *) BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; +@@ -7982,7 +7982,7 @@ + php_sapi_module=static + ;; + esac +- install_sapi="install-sapi" ++ install_sapi="" + + + case sapi/embed in @@ -11403,14 +11406,12 @@ BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ |