commit ec4806a9845b1a421e034600eb2a5497fa8716f7
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Nov 22 17:30:28 2024 +0100
Rel 1
php-shared.patch | 2 +-
php-stupidapache_version.patch | 33 ++++++++++++++++++++++-----------
php.spec | 7 +++----
3 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/php.spec b/php.spec
index 81bd06e..9b03157 100644
--- a/php.spec
+++ b/php.spec
@@ -128,10 +128,10 @@
%endif
%define orgname php
-%define ver_suffix 83
+%define ver_suffix 84
%define php_suffix %{!?with_default_php:%{ver_suffix}}
%define subver %{nil}
-%define rel 0.1
+%define rel 1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -2058,8 +2058,7 @@ for sapi in $sapis; do
sapi_args='--enable-embed'
;;
apxs2)
- ver=$(rpm -q --qf '%{V}' apache-devel)
- sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
+ sapi_args="--with-apxs2=%{apxs2}"
;;
litespeed)
sapi_args='--enable-litespeed'
diff --git a/php-shared.patch b/php-shared.patch
index 3935c5d..6fcf466 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -19,7 +19,7 @@
-libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --tag=CC --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS)
$(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+libphp_common.la: $(PHP_GLOBAL_OBJS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS)
$(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS)
$(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release
$(PHP_VERSION)
++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS)
$(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS)
$(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release
$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION)
+ -@$(LIBTOOL) --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null
2>&1
+
+libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index e8ae17b..f8426e3 100644
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -1,18 +1,29 @@
---- php-5.4.0alpha2/build/php.m4 2011-08-07 21:13:21.581133944 +0300
-+++ php-5.4.0alpha2/build/php.m4 2011-08-07 21:10:21.766717150 +0300
-@@ -2607,7 +2609,14 @@
- dnl This macro is used to get a comparable version for Apache.
+--- php-8.4.1/build/php.m4~ 2024-11-22 15:00:06.000000000 +0100
++++ php-8.4.1/build/php.m4 2024-11-22 15:03:55.783321362 +0100
+@@ -2036,6 +2036,18 @@ dnl This macro is used to get a comparab
dnl
- AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
-- ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
+ AC_DEFUN([PHP_AP_EXTRACT_VERSION], [m4_warn([obsolete],
+ [The macro 'PHP_AP_EXTRACT_VERSION' is obsolete. Use 'apxs -q
HTTPD_VERSION'])
+ PHP_ARG_WITH(apache-version, Set Apache version,
+ [ --with-apache-version=VERSION Set Apache version instead of
detecting from httpd binary])
-+
+ if test "$with_apache_version" != "no"; then
+ ac_output="foo bar baz $with_apache_version"
++ ac_IFS=$IFS
++IFS="- /.
++"
++ set $ac_output
++ IFS=$ac_IFS
++
++ APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
+ else
-+ ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
-+ fi
+ AS_IF([test -x "$1"], [
+ ac_output=$($1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//')
ac_IFS=$IFS
- IFS="- /.
- "
+@@ -2046,6 +2058,7 @@ IFS="- /.
+
+ APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
+ ])
++ fi
+ ])
+
+ dnl
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/ec4806a9845b1a421e034600eb2a5497fa8716f7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
