summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2024-04-08 13:02:03 +0200
committerØrjan Malde <red@foxi.me>2024-04-08 13:02:03 +0200
commitb7638d353ce99f967c2e1143ad51f3e171adacb2 (patch)
treea71be7c6c6bef3b378947b495e55f942c8eeb46b
parentaa7abe4cf8868c3fd87a7fee00cf6453b3f459a7 (diff)
downloadmidipix_build-b7638d353ce99f967c2e1143ad51f3e171adacb2.tar.bz2
midipix_build-b7638d353ce99f967c2e1143ad51f3e171adacb2.tar.xz
groups.d/231.native_packages_etc.group: php: build dom module as shared module
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups.d/231.native_packages_etc.group2
-rw-r--r--patches/php-8.3.4_pre.local.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index d3d1eb58..54594de5 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -386,7 +386,7 @@ gl_cv_func_getopt_gnu=yes"};
ac_cv_c_bigendian_php=no
ac_cv_write_stdout=yes
have_shm_mmap_posix=yes"};
-: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=shared --enable-pdo-sqlite=shared --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --enable-pcntl=shared --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --without-pcre-jit --with-bz2=${PREFIX_NATIVE} --with-gettext=${PREFIX_NATIVE} --disable-opcache-jit --disable-dl-test --disable-sockets"};
+: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp=shared --disable-gd --disable-phar --enable-pdo=shared --enable-pdo-sqlite=shared --enable-dom=shared --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --enable-pcntl=shared --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --without-pcre-jit --with-bz2=shared --with-gettext=shared --disable-opcache-jit --disable-dl-test --disable-sockets --enable-ctype=shared --enable-calendar=shared --enable-mbstring=shared"};
: ${PKG_PHP_ENV_VARS_EXTRA:="HOST_CC=gcc:READLINE_DIR=${PREFIX_NATIVE}/include/readline"};
: ${PKG_PHP_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_PHP_LIBTOOL:=rdlibtool};
diff --git a/patches/php-8.3.4_pre.local.patch b/patches/php-8.3.4_pre.local.patch
index 88431a5f..3d2fba04 100644
--- a/patches/php-8.3.4_pre.local.patch
+++ b/patches/php-8.3.4_pre.local.patch
@@ -780,7 +780,7 @@ diff -ru php-8.3.4.orig/configure php-8.3.4/configure
$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
- \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD)
-+ \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
++ \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \$(top_builddir)/ext/dom/dom.la
EOF
@@ -798,7 +798,7 @@ diff -ru php-8.3.4.orig/configure php-8.3.4/configure
$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
- \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD)
-+ \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so
++ \$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_xsl) \$(XSL_SHARED_LIBADD) \$(top_builddir)/libs/libphp.so \$(top_builddir)/ext/dom/dom.la
EOF