Rebase to pcp-6.3.1-1 with patch to resolve i386 perl fallout
Resolves: RHEL-30590 Resolves: RHEL-40631 Resolves: RHEL-45715 Resolves: RHEL-50941 Resolves: RHEL-58914 Resolves: RHEL-59366 Resolves: RHEL-58953
This commit is contained in:
parent
2a32e6eb7a
commit
cc7e381a79
1
pcp.spec
1
pcp.spec
@ -9,6 +9,7 @@ Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.t
|
||||
|
||||
# Keep xx-default-archive-version.patch for the life of RHEL9
|
||||
Patch1: redhat-issues-RHEL-2317-default-archive-version.patch
|
||||
Patch2: redhat-issues-RHEL-58953-perl-drop-Y2038-checks.patch
|
||||
|
||||
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
|
||||
ExcludeArch: %{ix86}
|
||||
|
52
redhat-issues-RHEL-58953-perl-drop-Y2038-checks.patch
Normal file
52
redhat-issues-RHEL-58953-perl-drop-Y2038-checks.patch
Normal file
@ -0,0 +1,52 @@
|
||||
diff -Naurp pcp-6.3.1.orig/configure pcp-6.3.1/configure
|
||||
--- pcp-6.3.1.orig/configure 2024-09-11 11:45:29.000000000 +1000
|
||||
+++ pcp-6.3.1/configure 2024-10-02 11:50:38.938538019 +1000
|
||||
@@ -5442,11 +5442,11 @@ if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
|
||||
-if test ${ac_cv_prog_cxx_11+y}
|
||||
+if test ${ac_cv_prog_cxx_cxx11+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
- ac_cv_prog_cxx_11=no
|
||||
+ ac_cv_prog_cxx_cxx11=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
@@ -5488,11 +5488,11 @@ if test x$ac_prog_cxx_stdcxx = xno
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
|
||||
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
|
||||
-if test ${ac_cv_prog_cxx_98+y}
|
||||
+if test ${ac_cv_prog_cxx_cxx98+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
- ac_cv_prog_cxx_98=no
|
||||
+ ac_cv_prog_cxx_cxx98=no
|
||||
ac_save_CXX=$CXX
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
@@ -9457,7 +9457,7 @@ printf %s "checking if Perl is Y2038-saf
|
||||
#
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; }
|
||||
- have_perl=false
|
||||
+ #have_perl=false -- el9 pre-existing-breakage
|
||||
;;
|
||||
67768036191676799)
|
||||
# all good
|
||||
diff -Naurp pcp-6.3.1.orig/configure.ac pcp-6.3.1/configure.ac
|
||||
--- pcp-6.3.1.orig/configure.ac 2024-09-11 11:45:29.000000000 +1000
|
||||
+++ pcp-6.3.1/configure.ac 2024-10-02 11:50:35.841529740 +1000
|
||||
@@ -1401,7 +1401,7 @@ AS_IF([test "x$do_perl" != "xno"], [
|
||||
# can't play in this sandpit
|
||||
#
|
||||
AC_MSG_RESULT([no])
|
||||
- have_perl=false
|
||||
+ #have_perl=false -- el9 pre-existing-breakage
|
||||
;;
|
||||
67768036191676799)
|
||||
# all good
|
Loading…
Reference in New Issue
Block a user