View | Details | Raw Unified | Return to bug 274011 | Differences between
and this patch

Collapse All | Expand All

(-)lang/php81/Makefile (+1 lines)
Lines 1-5 Link Here
1
PORTNAME=	php81
1
PORTNAME=	php81
2
DISTVERSION=	8.1.23
2
DISTVERSION=	8.1.23
3
PORTREVISION=	1
3
CATEGORIES?=	lang devel www
4
CATEGORIES?=	lang devel www
4
MASTER_SITES=	PHP/distributions
5
MASTER_SITES=	PHP/distributions
5
DISTNAME=	php-${DISTVERSION}
6
DISTNAME=	php-${DISTVERSION}
(-)lang/php81/files/patch-build_php.m4 (+11 lines)
Added Link Here
1
--- build/php.m4.orig	2023-09-22 14:27:52 UTC
2
+++ build/php.m4
3
@@ -2700,7 +2700,7 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CPU_INIT], [
4
   AC_MSG_CHECKING([for __builtin_cpu_init])
5
 
6
   AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[
7
-    return __builtin_cpu_init()? 1 : 0;
8
+    __builtin_cpu_init();return 1;
9
   ]])], [
10
     have_builtin_cpu_init=1
11
     AC_MSG_RESULT([yes])
(-)lang/php81/files/patch-configure.ac (-5 / +14 lines)
Lines 1-4 Link Here
1
--- configure.ac.orig	2023-03-14 19:50:20 UTC
1
--- configure.ac.orig	2023-08-30 08:23:26 UTC
2
+++ configure.ac
2
+++ configure.ac
3
@@ -55,6 +55,7 @@ AH_BOTTOM([
3
@@ -55,6 +55,7 @@ AH_BOTTOM([
4
 
4
 
Lines 8-14 Link Here
8
 #endif /* PHP_CONFIG_H */
8
 #endif /* PHP_CONFIG_H */
9
 ])
9
 ])
10
 
10
 
11
@@ -273,7 +274,6 @@ sinclude(Zend/Zend.m4)
11
@@ -275,7 +276,6 @@ sinclude(Zend/Zend.m4)
12
 
12
 
13
 dnl ----------------------------------------------------------------------------
13
 dnl ----------------------------------------------------------------------------
14
 
14
 
Lines 16-22 Link Here
16
 PHP_HELP_SEPARATOR([SAPI modules:])
16
 PHP_HELP_SEPARATOR([SAPI modules:])
17
 PHP_SHLIB_SUFFIX_NAMES
17
 PHP_SHLIB_SUFFIX_NAMES
18
 PHP_BUILD_PROGRAM
18
 PHP_BUILD_PROGRAM
19
@@ -614,7 +614,7 @@ memmem \
19
@@ -547,7 +547,7 @@ dnl Fix for these systems is already included in GCC 7
20
 dnl
21
 dnl At least some versions of FreeBSD seem to have buggy ifunc support, see
22
 dnl bug #77284. Conservatively don't use ifuncs on FreeBSD.
23
-AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*freebsd*|*openbsd*], [true], [
24
+AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*openbsd*], [true], [
25
   AX_GCC_FUNC_ATTRIBUTE([ifunc])
26
   AX_GCC_FUNC_ATTRIBUTE([target])
27
 ])
28
@@ -629,7 +629,7 @@ AC_FUNC_STRERROR_R
20
 AX_FUNC_WHICH_GETHOSTBYNAME_R
29
 AX_FUNC_WHICH_GETHOSTBYNAME_R
21
 
30
 
22
 dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
31
 dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
Lines 25-31 Link Here
25
 
34
 
26
 dnl Haiku does not have network api in libc.
35
 dnl Haiku does not have network api in libc.
27
 PHP_CHECK_FUNC_LIB(setsockopt, network)
36
 PHP_CHECK_FUNC_LIB(setsockopt, network)
28
@@ -1372,7 +1372,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
37
@@ -1387,7 +1387,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
29
 EXPANDED_DATADIR=$datadir
38
 EXPANDED_DATADIR=$datadir
30
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
39
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
31
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
40
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
Lines 34-40 Link Here
34
 
43
 
35
 exec_prefix=$old_exec_prefix
44
 exec_prefix=$old_exec_prefix
36
 libdir=$old_libdir
45
 libdir=$old_libdir
37
@@ -1591,7 +1591,7 @@ PHP_SUBST(all_targets)
46
@@ -1606,7 +1606,7 @@ PHP_SUBST(all_targets)
38
 PHP_SUBST(install_targets)
47
 PHP_SUBST(install_targets)
39
 PHP_SUBST(install_binary_targets)
48
 PHP_SUBST(install_binary_targets)
40
 
49
 

Return to bug 274011