#1 disable PHP script on 32-bit
Merged a month ago by jjames. Opened 2 months ago by remi.
rpms/ remi/flamegraph private-no32bit  into  rawhide

file modified
+27 -3
@@ -4,6 +4,16 @@ 

  %global date        20231107

  %global forgeurl    https://github.com/brendangregg/FlameGraph

  

+ %if 0%{?fedora} >= 41

+ %ifarch %{ix86}

+ %bcond_with    php

+ %else

+ %bcond_without php

+ %endif

+ %else

+ %bcond_without php

+ %endif

+ 

  # The subpackage layout was designed with the following points in mind:

  # 1. The scripts are very small, so packing them together doesn't hurt much.

  #    On the other hand, doing a fine-grained separation into subpackages
@@ -33,7 +43,6 @@ 

  BuildRequires:  perl-generators

  BuildRequires:  perl(Getopt::Long)

  BuildRequires:  perl(open)

- BuildRequires:  php-cli

  BuildRequires:  python3-devel

  

  %description
@@ -74,13 +83,16 @@ 

  %description    stackcollapse-perf

  Scripts for collapsing perf output for consumption by flamegraph.

  

+ %if %{with php}

  %package        stackcollapse-php

  Summary:        Stack collapser for PHP

  License:        GPL-2.0-or-later

+ BuildRequires:  php-cli

  Requires:       %{name} = %{version}-%{release}

  

  %description    stackcollapse-php

  A script for collapsing PHP trace output for consumption by flamegraph.

+ %endif

  

  %prep

  %forgeautosetup
@@ -112,14 +124,20 @@ 

             stackcollapse-go.pl stackcollapse-ibmjava.pl \

             stackcollapse-java-exceptions.pl stackcollapse-jstack.pl \

             stackcollapse-perf.pl stackcollapse-vtune-mc.pl \

-            stackcollapse-xdebug.php; do

+ %if %{with php}

+            stackcollapse-xdebug.php \

+ %endif

+            ; do

    help2man $HELP2MANFLAGS ./$fil > $fil.1

  done

  

  %install

  # Install the scripts

  mkdir -p %{buildroot}%{_bindir}

- cp -p *.{awk,php,pl,py} jmaps %{buildroot}%{_bindir}

+ cp -p *.{awk,pl,py} jmaps %{buildroot}%{_bindir}

+ %if %{with php}

+ cp -p *.php %{buildroot}%{_bindir}

+ %endif

  

  # Install the man pages

  mkdir -p %{buildroot}%{_mandir}/man1
@@ -186,11 +204,17 @@ 

  %{_mandir}/man1/range-perf.pl.1*

  %{_mandir}/man1/stackcollapse-perf.pl.1*

  

+ %if %{with php}

  %files          stackcollapse-php

  %{_bindir}/stackcollapse-xdebug.php

  %{_mandir}/man1/stackcollapse-xdebug.php.1*

+ %endif

  

  %changelog

+ * Tue Apr  9 2024 Remi Collet <remi@fedoraproject.org> - 8.0.1-14

+ - disable PHP script on 32-bit

+   https://fedoraproject.org/wiki/Changes/php_no_32_bit

+ 

  * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-17

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

  

I would prefer to just stop building flamegraph for 32-bit altogether. Repoquery shows that perl-Devel-NYTProf is the only consuming package still built for 32-bit. It, however, is consumed by perl-CatalystX-Profile, perl-Task-Catalyst, and vim-perl-support. That's only 4 packages. Let me submit PRs for them to drop 32-bit support. If I can get the maintainers to agree, we can just add an ExcludeArch to flamegraph.

FYI: I plan to exclude 32-bit for 8.3.7RC1 planned for Tuesday April 16th (all extensions are already rebuilt without 32-bit)

Thanks for the heads up. I've been too busy to push the 32-bit removal project through all 4 packages on top of flamegraph, so I'll merge this for now.

Pull-Request has been merged by jjames

a month ago

Except ... what happened with that changelog entry? It's got incorrect version and release numbers. I'll fix it in a supplemental commit.

Metadata