diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-03 12:25:49 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-03 12:25:49 +0200 |
| commit | 1581540300e603c28091e20c2255264c1f087cd5 (patch) | |
| tree | 4125e365a5f63439b1e35c87422d17abf22a9827 | |
| parent | 968bf9f15d67b17b31909b145811ebd1215e29b0 (diff) | |
add patch for bash 5.3.0 from
https://github.com/awesomized/ext-ion/pull/12
| -rw-r--r-- | ion-bash53.patch | 23 | ||||
| -rw-r--r-- | php-pecl-ion.spec | 15 |
2 files changed, 34 insertions, 4 deletions
diff --git a/ion-bash53.patch b/ion-bash53.patch new file mode 100644 index 0000000..ed1a07a --- /dev/null +++ b/ion-bash53.patch @@ -0,0 +1,23 @@ +From c6aa40dc135ef52263eddc9172a63615df0d36c4 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 3 Sep 2025 12:07:39 +0200 +Subject: [PATCH] workaround for broken PHP_EXPAND_PATH + +--- + config.m4 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 63188c2..1e96289 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -38,8 +38,7 @@ AC_DEFUN([ION_BUNDLE], [dnl + PHP_ADD_INCLUDE(PHP_EXT_SRCDIR([ion])/ion-c/ionc/include) + PHP_ADD_INCLUDE(PHP_EXT_SRCDIR([ion])/ion-c/decNumber/include) + +- PHP_EXPAND_PATH(PHP_EXT_BUILDDIR([ion]), bdir) +- bdir="$bdir/ion-c/build" ++ bdir="$ext_builddir/ion-c/build" + if test "$ext_shared" = yes; then + ION_SHARED_LIBADD="-lionc_static -ldecNumber_static -L$bdir/ionc -L$bdir/decNumber" + else diff --git a/php-pecl-ion.spec b/php-pecl-ion.spec index 5e0f051..a915b28 100644 --- a/php-pecl-ion.spec +++ b/php-pecl-ion.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-ion # -# Copyright (c) 2022-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2022-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -37,7 +37,7 @@ Summary: Amazon ION support Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} @@ -46,6 +46,7 @@ Source1: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{pecl_name}-php82.patch Patch1: %{pecl_name}-php84.patch +Patch2: %{pecl_name}-bash53.patch BuildRequires: make BuildRequires: cmake >= 3.6 @@ -83,6 +84,7 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 -b .php82 %patch -P1 -p1 -b .php84 +%patch -P2 -p1 -b .bash53 # use bundled library ln -s ../%{gh_project}-%{gh_commit} ion-c @@ -199,6 +201,11 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Wed Sep 3 2025 Remi Collet <remi@remirepo.net> - 0.2.1-7 +- re-license spec file to CECILL-2.1 +- add patch for bash 5.3.0 from + https://github.com/awesomized/ext-ion/pull/12 + * Wed Nov 20 2024 Remi Collet <remi@remirepo.net> - 0.2.1-6 - fix previous patch to fix PHP < 8.4 builds |