packages/libguestfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port to php 8.0.0

Browse Source
This commit is contained in:
maminjie 2020-12-31 14:23:20 +08:00
parent 6c0e86d538
commit f836531e8a
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0003-port-to-php-8.0.0.patch Normal file
View File

@ -0,0 +1,52 @@
From fdeb579ae5c58a5da81c866a83d81e76da3347c1 Mon Sep 17 00:00:00 2001
From: maminjie <maminjie1@huawei.com>
Date: Tue, 1 Dec 2020 12:00:20 +0800
Subject: [PATCH] port to php 8.0.0
---
generator/php.ml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/generator/php.ml b/generator/php.ml
index e07813f..4046aa8 100644
--- a/generator/php.ml
+++ b/generator/php.ml
@@ -96,7 +96,7 @@ static int res_guestfs_h;
#if ZEND_MODULE_API_NO >= 20151012
# define GUESTFS_RETURN_STRING(x, duplicate) \\
- do { if (duplicate) RETURN_STRING(x) else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0)
+ do { if (duplicate) { RETURN_STRING(x); } else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0)
# define guestfs_add_assoc_string(arg, key, str, dup) \\
add_assoc_string(arg, key, str)
# define guestfs_add_assoc_stringl(arg, key, str, len, dup) \\
@@ -177,7 +177,7 @@ static void
guestfs_php_handle_dtor (zend_resource *rsrc)
#else
static void
-guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc TSRMLS_DC)
+guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc)
#endif
{
guestfs_h *g = (guestfs_h *) rsrc->ptr;
@@ -247,7 +247,7 @@ PHP_FUNCTION (guestfs_last_error)
zval *z_g;
guestfs_h *g;
- if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r\",
+ if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r\",
&z_g) == FAILURE) {
RETURN_FALSE;
}
@@ -353,7 +353,7 @@ PHP_FUNCTION (guestfs_last_error)
)
else param_string in
- pr " if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r%s\",\n"
+ pr " if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r%s\",\n"
param_string;
pr " &z_g";
List.iter (
--
2.23.0

6
libguestfs.spec
View File

@ -4,7 +4,7 @@
Name: libguestfs
Version: 1.40.2
Release: 10
Release: 11
Epoch: 1
Summary: A set of tools for accessing and modifying virtual machine (VM) disk images
License: LGPLv2+
@ -14,6 +14,7 @@ Source1: guestfish.sh
Source2: yum.conf.in
Patch0000: 0001-libguestfs-PYTHON_LIBS-is-not-set-in-Python-3.8.patch
Patch0001: 0002-fts-remove-NOSTAT_LEAF_OPTIMIZATION.patch
Patch0002: 0003-port-to-php-8.0.0.patch
BuildRequires: gcc-c++, rpcgen, libtirpc-devel, supermin-devel >= 5.1.18, hivex-devel >= 1.2.7-7, ocaml-hivex-devel, perl(Pod::Simple), perl(Pod::Man)
BuildRequires: /usr/bin/pod2text, po4a, augeas-devel >= 1.7.0, readline-devel, genisoimage, libxml2-devel, createrepo, glibc-static, libselinux-utils
@ -376,6 +377,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%exclude %{_mandir}/man1/virt-tar.1*
%changelog
* Thu Dec 31 2020 maminjie <maminjie1@huawei.com> - 1:1.40.2-11
- Port to php 8.0.0
* Wed Dec 16 2020 maminjie <maminjie1@huawei.com> - 1:1.40.2-10
- Enable appliance that is necessary