From df28070196735844bd3df89c4b56cda1cb92dfdd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Mar 2026 12:23:26 +0100 Subject: use clang21 on F44 --- php-pecl-skywalking-agent.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/php-pecl-skywalking-agent.spec b/php-pecl-skywalking-agent.spec index 351ead5..9b85ff1 100644 --- a/php-pecl-skywalking-agent.spec +++ b/php-pecl-skywalking-agent.spec @@ -33,7 +33,7 @@ Name: %{?scl_prefix}php-pecl-skywalking-agent Summary: Apache SkyWalking PHP Agent License: Apache-2.0 Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} %forgemeta URL: %{forgeurl} Source0: %{forgesource} @@ -50,7 +50,11 @@ BuildRequires: cargo >= 1.85 BuildRequires: rust >= 1.85 BuildRequires: rustfmt BuildRequires: protobuf-compiler +%if 0%{?fedora} >= 44 +BuildRequires: clang21-devel +%else BuildRequires: clang-devel +%endif BuildRequires: pkgconfig(libsasl2) BuildRequires: openssl-devel %if 0%{?fedora} >= 41 @@ -152,6 +156,10 @@ grep -h rust-version mycargo/*/Cargo.toml %{sources}/Cargo.toml | sort -u | tail export CARGO_HOME=$PWD/mycargo export RUSTFLAGS="%{?build_rustflags}%{!?build_rustflags:-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cstrip=none -Cforce-frame-pointers=yes --cap-lints=warn}" +%if 0%{?fedora} >= 44 +# Workaround from https://github.com/apache/skywalking/issues/13747 +export LIBCLANG_PATH=/usr/lib64/llvm21/lib64 +%endif cd %{sources} %{__phpize} @@ -197,10 +205,15 @@ install -D -m 644 ../%{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %changelog +* Wed Mar 18 2026 Remi Collet - 1.1.0-2 +- use clang21 on F44 + * Mon Mar 16 2026 Remi Collet - 1.1.0-1 - update to 1.1.0 - drop pear/pecl dependency - sources from github +- open https://github.com/apache/skywalking/issues/13747 + build failure with recent compiler (Fedora 44) * Tue Apr 22 2025 Remi Collet - 1.0.0-1 - update to 1.0.0 -- cgit