From 3f56ba331053e7c51116fc16ec97b9d8cfe7d2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org> Date: Sat, 10 May 2025 05:22:22 +0200 Subject: [PATCH] Use ICU >= 75 version to determine the need for C++11 or C++17 --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 1558fc7306..b3b7e10a1f 100755 --- a/debian/rules +++ b/debian/rules @@ -33,12 +33,12 @@ PHP_MAJOR_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$1}' PHP_MINOR_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$2}') PHP_RELEASE_VERSION := $(shell echo $(PHP_DFSG_VERSION) | awk -F. '{print $$3}') -ifeq ($(DEB_DISTRIBUTION),$(filter $(DEB_DISTRIBUTION),jessie stretch xenial bionic)) -export ICU_CXXFLAGS := -std=c++11 -endif +ICU_VERSION := $(shell dpkg -s libicu-dev | sed -ne 's/^Version: \(.*\)$$/\1/p') -ifeq ($(DEB_DISTRIBUTION),$(filter $(DEB_DISTRIBUTION),trixie)) +ifeq ($(shell dpkg --compare-versions $(ICU_VERSION) ge 75;echo $$?),0) export ICU_CXXFLAGS := -std=c++17 +else +export ICU_CXXFLAGS := -std=c++11 endif # Enable ZTS build if $(DEB_SOURCE) ends with -zts -- GitLab