diff --git a/perl-5.28.0-Pass-CFLAGS-to-dtrace.patch b/perl-5.28.0-Pass-CFLAGS-to-dtrace.patch new file mode 100644 index 0000000..2e9a36d --- /dev/null +++ b/perl-5.28.0-Pass-CFLAGS-to-dtrace.patch @@ -0,0 +1,63 @@ +Subject: [PATCH] Pass CFLAGS to dtrace + +Signed-off-by: Petr Písař +--- + Makefile.SH | 8 +++++--- + cflags.SH | 5 ++++- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/Makefile.SH b/Makefile.SH +index 5fc6d1c..e89ad70 100755 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -462,6 +462,8 @@ CCCMD = sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@ + + CCCMDSRC = sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $< + ++DTRACEFLAGS = sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@ ++ + CONFIGPM_FROM_CONFIG_SH = lib/Config.pm lib/Config_heavy.pl + CONFIGPM = $(CONFIGPM_FROM_CONFIG_SH) lib/Config_git.pl + +@@ -895,19 +897,19 @@ $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt) + -rm -rf mpdtrace + mkdir mpdtrace + cp $(miniperl_objs_nodt) mpdtrace/ +- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs) ++ CFLAGS="`$(DTRACEFLAGS)`" $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs) + + $(DTRACE_PERLLIB_O): perldtrace.d $(perllib_objs_nodt) + -rm -rf libpdtrace + mkdir libpdtrace + cp $(perllib_objs_nodt) libpdtrace/ +- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs) ++ CFLAGS="`$(DTRACEFLAGS)`" $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs) + + $(DTRACE_MAIN_O): perldtrace.d perlmain$(OBJ_EXT) + -rm -rf maindtrace + mkdir maindtrace + cp perlmain$(OBJ_EXT) maindtrace/ +- $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) || \ ++ CFLAGS="`$(DTRACEFLAGS)`" $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) || \ + ( $(ECHO) "No probes in perlmain$(OBJ_EXT), generating a dummy $(DTRACE_MAIN_O)" && \ + $(ECHO) >dtrace_main.c && \ + `$(CCCMD)` $(PLDLFLAGS) dtrace_main.c && \ +diff --git a/cflags.SH b/cflags.SH +index 3af1e97..b845127 100755 +--- a/cflags.SH ++++ b/cflags.SH +@@ -519,7 +519,10 @@ for file do + toke) optimize=-O0 ;; + esac + +- echo "$cc -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra" ++ case "$file" in ++ dtrace_*) echo "$ccflags $stdflags $optimize $warn $extra";; ++ *) echo "$cc -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra";; ++ esac + + . $TOP/config.sh + +-- +2.17.1 + diff --git a/perl.spec b/perl.spec index 5398711..f1cf52c 100644 --- a/perl.spec +++ b/perl.spec @@ -81,7 +81,7 @@ License: GPL+ or Artistic Epoch: %{perl_epoch} Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 423%{?dist} +Release: 424%{?dist} Summary: Practical Extraction and Report Language Url: https://www.perl.org/ Source0: https://www.cpan.org/src/5.0/perl-%{perl_version}.tar.xz @@ -203,6 +203,9 @@ Patch28: perl-5.29.2-perl-132683-don-t-try-to-convert-PL_sv_placeholder-i # Fix upack "u" of invalid data, RT#132655, in upstream after 5.29.2 Patch29: perl-5.29.2-perl-132655-nul-terminate-result-of-unpack-u-of-inva.patch +# Pass the correct CFLAGS to dtrace +Patch30: perl-5.28.0-Pass-CFLAGS-to-dtrace.patch + # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch @@ -2785,6 +2788,7 @@ Perl extension for Version Objects %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 %patch200 -p1 %patch201 -p1 @@ -2820,6 +2824,7 @@ perl -x patchlevel.h \ 'Fedora Patch26: Fix Time::Piece to handle objects in overloaded methods correctly' \ 'Fedora Patch27: Fix an assignment to a lexical variable in multiconcatenation expressions (RT#133441)' \ 'Fedora Patch28: Fix a spurious warning about uninitialized value in warn (RT#132683)' \ + 'Fedora Patch30: Pass the correct CFLAGS to dtrace' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ %{nil} @@ -5108,6 +5113,9 @@ popd # Old changelog entries are preserved in CVS. %changelog +* Thu Oct 25 2018 Jitka Plesnikova - 4:5.28.0-424 +- Fix annocheck failure by passing CFLAGS to dtrace + * Mon Sep 24 2018 Petr Pisar - 4:5.28.0-423 - Fix upack "u" of invalid data (RT#132655)