Update to version 3.26.5
Resolves: RHEL-7374 Resolves: RHEL-7393 Resolves: RHEL-7395 Resolves: RHEL-14869
This commit is contained in:
Tom Stellard
parent
9c8ca33005
commit
304b4550ce
@ -1,142 +0,0 @@
|
|||||||
From 8db50771206c44f6e2b301c78b1cad8abc46ece3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Domen Vrankar <domen.vrankar@gmail.com>
|
|
||||||
Date: Mon, 29 Mar 2021 00:06:05 +0200
|
|
||||||
Subject: [PATCH 1/3] CPackRPM: handle scripts in debuginfo single package mode
|
|
||||||
|
|
||||||
Enabling CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE while
|
|
||||||
using rpm install or erase scripts resulted in
|
|
||||||
resulted missing scripts for non default components.
|
|
||||||
|
|
||||||
Fixes: #21974
|
|
||||||
(cherry picked from commit 31c184ad690be45494cf997df71ad09293a0d4b0)
|
|
||||||
---
|
|
||||||
Modules/Internal/CPack/CPackRPM.cmake | 19 +++++++++++++++++++
|
|
||||||
.../RunCMake/CPack/RPM/Prerequirements.cmake | 7 +++++++
|
|
||||||
Tests/RunCMake/CPack/RunCMakeTest.cmake | 2 +-
|
|
||||||
.../tests/INSTALL_SCRIPTS/ExpectedFiles.cmake | 7 ++++++-
|
|
||||||
...RPM-COMPONENT-single_debug_info-stderr.txt | 1 +
|
|
||||||
.../INSTALL_SCRIPTS/RPM-Prerequirements.cmake | 11 +++++++++++
|
|
||||||
.../CPack/tests/INSTALL_SCRIPTS/test.cmake | 6 ++++++
|
|
||||||
7 files changed, 51 insertions(+), 2 deletions(-)
|
|
||||||
create mode 100644 Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt
|
|
||||||
create mode 100644 Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
|
|
||||||
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
index 08bbc6804c..2ee062238c 100644
|
|
||||||
--- a/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
+++ b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
@@ -1637,6 +1637,25 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
|
|
||||||
%description -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
\@CPACK_RPM_PACKAGE_DESCRIPTION\@
|
|
||||||
|
|
||||||
+%post -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@RPM_SYMLINK_POSTINSTALL\@
|
|
||||||
+\@CPACK_RPM_SPEC_POSTINSTALL\@
|
|
||||||
+
|
|
||||||
+%posttrans -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@CPACK_RPM_SPEC_POSTTRANS\@
|
|
||||||
+
|
|
||||||
+%postun -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@CPACK_RPM_SPEC_POSTUNINSTALL\@
|
|
||||||
+
|
|
||||||
+%pre -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@CPACK_RPM_SPEC_PREINSTALL\@
|
|
||||||
+
|
|
||||||
+%pretrans -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@CPACK_RPM_SPEC_PRETRANS\@
|
|
||||||
+
|
|
||||||
+%preun -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
+\@CPACK_RPM_SPEC_PREUNINSTALL\@
|
|
||||||
+
|
|
||||||
%files -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
%defattr(\@TMP_DEFAULT_FILE_PERMISSIONS\@,\@TMP_DEFAULT_USER\@,\@TMP_DEFAULT_GROUP\@,\@TMP_DEFAULT_DIR_PERMISSIONS\@)
|
|
||||||
\@CPACK_RPM_INSTALL_FILES\@
|
|
||||||
diff --git a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
|
|
||||||
index 3416205bc6..e95cd15161 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/RPM/Prerequirements.cmake
|
|
||||||
@@ -13,4 +13,11 @@ function(get_test_prerequirements found_var config_file)
|
|
||||||
"\nset(RPMBUILD_EXECUTABLE \"${RPMBUILD_EXECUTABLE}\")")
|
|
||||||
set(${found_var} true PARENT_SCOPE)
|
|
||||||
endif()
|
|
||||||
+
|
|
||||||
+ # optional tool for some tests
|
|
||||||
+ find_program(OBJDUMP_EXECUTABLE objdump)
|
|
||||||
+ if(OBJDUMP_EXECUTABLE)
|
|
||||||
+ file(APPEND "${config_file}"
|
|
||||||
+ "\nset(OBJDUMP_EXECUTABLE \"${OBJDUMP_EXECUTABLE}\")")
|
|
||||||
+ endif()
|
|
||||||
endfunction()
|
|
||||||
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
index 15bfb60ee0..48b9c1d95c 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
@@ -16,7 +16,7 @@ run_cpack_test(VERSION "RPM.VERSION;DEB.VERSION" false "MONOLITHIC;COMPONENT")
|
|
||||||
run_cpack_test(EXTRA "DEB.EXTRA" false "COMPONENT")
|
|
||||||
run_cpack_test_subtests(GENERATE_SHLIBS "soversion_not_zero;soversion_zero" "DEB.GENERATE_SHLIBS" true "COMPONENT")
|
|
||||||
run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB.GENERATE_SHLIBS_LDCONFIG" true "COMPONENT")
|
|
||||||
-run_cpack_test(INSTALL_SCRIPTS "RPM.INSTALL_SCRIPTS" false "COMPONENT")
|
|
||||||
+run_cpack_test_subtests(INSTALL_SCRIPTS "default;single_debug_info" "RPM.INSTALL_SCRIPTS" false "COMPONENT")
|
|
||||||
run_cpack_test(LONG_FILENAMES "DEB.LONG_FILENAMES" false "MONOLITHIC")
|
|
||||||
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM.MAIN_COMPONENT" false "COMPONENT")
|
|
||||||
run_cpack_test(MINIMAL "RPM.MINIMAL;DEB.MINIMAL;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ;External" false "MONOLITHIC;COMPONENT")
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
index de38df9ef4..29e36a33fb 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
@@ -1,5 +1,10 @@
|
|
||||||
+if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+ set(EXPECTED_FILE_1 "install_scripts-0.1.1-1.*.rpm")
|
|
||||||
+else()
|
|
||||||
+ set(EXPECTED_FILE_1_COMPONENT "foo")
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
set(EXPECTED_FILES_COUNT "2")
|
|
||||||
-set(EXPECTED_FILE_1_COMPONENT "foo")
|
|
||||||
set(EXPECTED_FILE_CONTENT_1_LIST "/foo;/foo/CMakeLists.txt")
|
|
||||||
set(EXPECTED_FILE_2_COMPONENT "bar")
|
|
||||||
set(EXPECTED_FILE_CONTENT_2_LIST "/bar;/bar/CMakeLists.txt")
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..8d98f9debd
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+.*
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..c5d20cc691
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+function(get_test_prerequirements found_var config_file)
|
|
||||||
+ if(SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+ include(${config_file})
|
|
||||||
+
|
|
||||||
+ if(OBJDUMP_EXECUTABLE)
|
|
||||||
+ set(${found_var} true PARENT_SCOPE)
|
|
||||||
+ endif()
|
|
||||||
+ else()
|
|
||||||
+ set(${found_var} true PARENT_SCOPE)
|
|
||||||
+ endif()
|
|
||||||
+endfunction()
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
index c200fa502c..6877c57744 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
@@ -24,6 +24,12 @@ if(GENERATOR_TYPE STREQUAL "RPM")
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
|
|
||||||
set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
|
|
||||||
+
|
|
||||||
+ if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+ set(CPACK_RPM_MAIN_COMPONENT "foo")
|
|
||||||
+ set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
|
|
||||||
+ set(CPACK_RPM_FOO_FILE_NAME "RPM-DEFAULT")
|
|
||||||
+ endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From f72734ff7712d6aae837f940a45d6e7508bb182c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brad King <brad.king@kitware.com>
|
|
||||||
Date: Thu, 20 Oct 2022 13:38:20 -0400
|
|
||||||
Subject: [PATCH] Tests: Explicitly allow usage of git file-based protocol in
|
|
||||||
test cases
|
|
||||||
|
|
||||||
Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by
|
|
||||||
default. The change has also been backported to other Git versions by
|
|
||||||
distros. This breaks some of our test cases that use the file-based
|
|
||||||
protocol locally to simulate real workflows without requiring network
|
|
||||||
access. In these cases the file protocol is safe, so explicitly enable
|
|
||||||
it in the tests.
|
|
||||||
|
|
||||||
(cherry picked from commit 79ce0f434e916684d734e136b92e14f472a9d14a)
|
|
||||||
---
|
|
||||||
Tests/CMakeLists.txt | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
|
|
||||||
index 8e7c04fbd0..d011020f99 100644
|
|
||||||
--- a/Tests/CMakeLists.txt
|
|
||||||
+++ b/Tests/CMakeLists.txt
|
|
||||||
@@ -1540,6 +1540,7 @@ if(BUILD_TESTING)
|
|
||||||
)
|
|
||||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject")
|
|
||||||
set_tests_properties(ExternalProject PROPERTIES
|
|
||||||
+ ENVIRONMENT GIT_ALLOW_PROTOCOL=file
|
|
||||||
RUN_SERIAL 1
|
|
||||||
TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
|
|
||||||
|
|
||||||
@@ -2653,6 +2654,7 @@ if(BUILD_TESTING)
|
|
||||||
-P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake"
|
|
||||||
)
|
|
||||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}")
|
|
||||||
+ set_property(TEST CTest.UpdateGIT PROPERTY ENVIRONMENT GIT_ALLOW_PROTOCOL=file)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Test CTest Update with HG
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,390 +0,0 @@
|
|||||||
From b085a0fc400d005f5a70b4148ac7d946967d50dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Domen Vrankar <domen.vrankar@gmail.com>
|
|
||||||
Date: Thu, 1 Apr 2021 22:28:24 +0200
|
|
||||||
Subject: [PATCH 2/3] CPackRPM: add scriplets tags only if scripts exist
|
|
||||||
|
|
||||||
Scriplet tags should not be added to generated
|
|
||||||
spec files if scripts weren't provided as those
|
|
||||||
tags are otherwise present in generated rpm file
|
|
||||||
even if the script wasn't provided thereby
|
|
||||||
generating unneeded dependency on shell.
|
|
||||||
|
|
||||||
Fixes: #21345
|
|
||||||
(cherry picked from commit 34c8a23044eaf8d56f405c4c9f13b53d0b47c963)
|
|
||||||
---
|
|
||||||
Modules/Internal/CPack/CPackRPM.cmake | 103 ++++++++++------
|
|
||||||
Tests/RunCMake/CPack/RunCMakeTest.cmake | 2 +-
|
|
||||||
.../tests/INSTALL_SCRIPTS/ExpectedFiles.cmake | 2 +-
|
|
||||||
...NT-no_scripts_single_debug_info-stderr.txt | 1 +
|
|
||||||
.../INSTALL_SCRIPTS/RPM-Prerequirements.cmake | 2 +-
|
|
||||||
.../tests/INSTALL_SCRIPTS/VerifyResult.cmake | 39 ++++---
|
|
||||||
.../CPack/tests/INSTALL_SCRIPTS/test.cmake | 110 +++++++++---------
|
|
||||||
7 files changed, 153 insertions(+), 106 deletions(-)
|
|
||||||
create mode 100644 Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt
|
|
||||||
|
|
||||||
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
index 2ee062238c..d4d13b8367 100644
|
|
||||||
--- a/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
+++ b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
@@ -6,6 +6,56 @@
|
|
||||||
cmake_policy(PUSH)
|
|
||||||
cmake_policy(SET CMP0057 NEW) # if IN_LIST
|
|
||||||
|
|
||||||
+function(set_spec_script_if_enabled TYPE PACKAGE_NAME VAR)
|
|
||||||
+ if(NOT "${VAR}" STREQUAL "" AND NOT "${VAR}" STREQUAL "\n")
|
|
||||||
+ if(PACKAGE_NAME)
|
|
||||||
+ set(PACKAGE_NAME " -n ${PACKAGE_NAME}")
|
|
||||||
+ endif()
|
|
||||||
+ set(${TYPE}_
|
|
||||||
+ "%${TYPE}${PACKAGE_NAME}\n"
|
|
||||||
+ "${VAR}\n" PARENT_SCOPE)
|
|
||||||
+ else()
|
|
||||||
+ set(${TYPE} "" PARENT_SCOPE)
|
|
||||||
+ endif()
|
|
||||||
+endfunction()
|
|
||||||
+
|
|
||||||
+macro(set_spec_scripts PACKAGE_NAME)
|
|
||||||
+ # we should only set scripts that were provided
|
|
||||||
+ # as script announcement without content inside
|
|
||||||
+ # spec file will generate unneeded dependency
|
|
||||||
+ # on shell
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "post"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${RPM_SYMLINK_POSTINSTALL}\n${CPACK_RPM_SPEC_POSTINSTALL}")
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "posttrans"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${CPACK_RPM_SPEC_POSTTRANS}")
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "postun"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${CPACK_RPM_SPEC_POSTUNINSTALL}")
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "pre"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${CPACK_RPM_SPEC_PREINSTALL}")
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "pretrans"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${CPACK_RPM_SPEC_PRETRANS}")
|
|
||||||
+
|
|
||||||
+ set_spec_script_if_enabled(
|
|
||||||
+ "preun"
|
|
||||||
+ "${PACKAGE_NAME}"
|
|
||||||
+ "${CPACK_RPM_SPEC_PREUNINSTALL}")
|
|
||||||
+endmacro()
|
|
||||||
+
|
|
||||||
function(get_file_permissions FILE RETURN_VAR)
|
|
||||||
execute_process(COMMAND ls -l ${FILE}
|
|
||||||
OUTPUT_VARIABLE permissions_
|
|
||||||
@@ -1607,6 +1657,9 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
|
|
||||||
)
|
|
||||||
|
|
||||||
elseif(GENERATE_SPEC_PARTS) # binary rpm with single debuginfo package
|
|
||||||
+
|
|
||||||
+ set_spec_scripts("${CPACK_RPM_PACKAGE_NAME}")
|
|
||||||
+
|
|
||||||
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
|
|
||||||
"# -*- rpm-spec -*-
|
|
||||||
%package -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
@@ -1637,24 +1690,12 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
|
|
||||||
%description -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
\@CPACK_RPM_PACKAGE_DESCRIPTION\@
|
|
||||||
|
|
||||||
-%post -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@RPM_SYMLINK_POSTINSTALL\@
|
|
||||||
-\@CPACK_RPM_SPEC_POSTINSTALL\@
|
|
||||||
-
|
|
||||||
-%posttrans -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@CPACK_RPM_SPEC_POSTTRANS\@
|
|
||||||
-
|
|
||||||
-%postun -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@CPACK_RPM_SPEC_POSTUNINSTALL\@
|
|
||||||
-
|
|
||||||
-%pre -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@CPACK_RPM_SPEC_PREINSTALL\@
|
|
||||||
-
|
|
||||||
-%pretrans -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@CPACK_RPM_SPEC_PRETRANS\@
|
|
||||||
-
|
|
||||||
-%preun -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
-\@CPACK_RPM_SPEC_PREUNINSTALL\@
|
|
||||||
+\@post_\@
|
|
||||||
+\@posttrans_\@
|
|
||||||
+\@postun_\@
|
|
||||||
+\@pre_\@
|
|
||||||
+\@pretrans_\@
|
|
||||||
+\@preun_\@
|
|
||||||
|
|
||||||
%files -n \@CPACK_RPM_PACKAGE_NAME\@
|
|
||||||
%defattr(\@TMP_DEFAULT_FILE_PERMISSIONS\@,\@TMP_DEFAULT_USER\@,\@TMP_DEFAULT_GROUP\@,\@TMP_DEFAULT_DIR_PERMISSIONS\@)
|
|
||||||
@@ -1681,6 +1722,8 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
|
|
||||||
set(RPMBUILD_FLAGS "-bb")
|
|
||||||
if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
|
|
||||||
|
|
||||||
+ set_spec_scripts("")
|
|
||||||
+
|
|
||||||
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
|
|
||||||
"# Restore old style debuginfo creation for rpm >= 4.14.
|
|
||||||
%undefine _debugsource_packages
|
|
||||||
@@ -1744,24 +1787,12 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%clean
|
|
||||||
|
|
||||||
-%post
|
|
||||||
-\@RPM_SYMLINK_POSTINSTALL\@
|
|
||||||
-\@CPACK_RPM_SPEC_POSTINSTALL\@
|
|
||||||
-
|
|
||||||
-%posttrans
|
|
||||||
-\@CPACK_RPM_SPEC_POSTTRANS\@
|
|
||||||
-
|
|
||||||
-%postun
|
|
||||||
-\@CPACK_RPM_SPEC_POSTUNINSTALL\@
|
|
||||||
-
|
|
||||||
-%pre
|
|
||||||
-\@CPACK_RPM_SPEC_PREINSTALL\@
|
|
||||||
-
|
|
||||||
-%pretrans
|
|
||||||
-\@CPACK_RPM_SPEC_PRETRANS\@
|
|
||||||
-
|
|
||||||
-%preun
|
|
||||||
-\@CPACK_RPM_SPEC_PREUNINSTALL\@
|
|
||||||
+\@post_\@
|
|
||||||
+\@posttrans_\@
|
|
||||||
+\@postun_\@
|
|
||||||
+\@pre_\@
|
|
||||||
+\@pretrans_\@
|
|
||||||
+\@preun_\@
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(\@TMP_DEFAULT_FILE_PERMISSIONS\@,\@TMP_DEFAULT_USER\@,\@TMP_DEFAULT_GROUP\@,\@TMP_DEFAULT_DIR_PERMISSIONS\@)
|
|
||||||
diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
index 48b9c1d95c..a3c72a1cf2 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
|
|
||||||
@@ -16,7 +16,7 @@ run_cpack_test(VERSION "RPM.VERSION;DEB.VERSION" false "MONOLITHIC;COMPONENT")
|
|
||||||
run_cpack_test(EXTRA "DEB.EXTRA" false "COMPONENT")
|
|
||||||
run_cpack_test_subtests(GENERATE_SHLIBS "soversion_not_zero;soversion_zero" "DEB.GENERATE_SHLIBS" true "COMPONENT")
|
|
||||||
run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB.GENERATE_SHLIBS_LDCONFIG" true "COMPONENT")
|
|
||||||
-run_cpack_test_subtests(INSTALL_SCRIPTS "default;single_debug_info" "RPM.INSTALL_SCRIPTS" false "COMPONENT")
|
|
||||||
+run_cpack_test_subtests(INSTALL_SCRIPTS "default;single_debug_info;no_scripts;no_scripts_single_debug_info" "RPM.INSTALL_SCRIPTS" false "COMPONENT")
|
|
||||||
run_cpack_test(LONG_FILENAMES "DEB.LONG_FILENAMES" false "MONOLITHIC")
|
|
||||||
run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM.MAIN_COMPONENT" false "COMPONENT")
|
|
||||||
run_cpack_test(MINIMAL "RPM.MINIMAL;DEB.MINIMAL;7Z;TBZ2;TGZ;TXZ;TZ;ZIP;STGZ;External" false "MONOLITHIC;COMPONENT")
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
index 29e36a33fb..5a87c442b5 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+if(RunCMake_SUBTEST_SUFFIX MATCHES ".*single_debug_info")
|
|
||||||
set(EXPECTED_FILE_1 "install_scripts-0.1.1-1.*.rpm")
|
|
||||||
else()
|
|
||||||
set(EXPECTED_FILE_1_COMPONENT "foo")
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..8d98f9debd
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+.*
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
index c5d20cc691..90cfe4467f 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
function(get_test_prerequirements found_var config_file)
|
|
||||||
- if(SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+ if(SUBTEST_SUFFIX MATCHES ".*single_debug_info")
|
|
||||||
include(${config_file})
|
|
||||||
|
|
||||||
if(OBJDUMP_EXECUTABLE)
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
|
|
||||||
index 1a1e983737..0c42d90695 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
|
|
||||||
@@ -7,23 +7,34 @@ function(checkScripts_ FILE COMPARE_LIST)
|
|
||||||
ERROR_QUIET
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
|
|
||||||
- string(REPLACE "\n" ";" FILE_SCRIPTS_LIST_ "${FILE_SCRIPTS_}")
|
|
||||||
+ if(COMPARE_LIST STREQUAL "")
|
|
||||||
+ if(NOT FILE_SCRIPTS_ STREQUAL "")
|
|
||||||
+ message(FATAL_ERROR "No scripts were expected in '${FILE}'; file info: '${FILE_SCRIPTS_}'")
|
|
||||||
+ endif()
|
|
||||||
+ else()
|
|
||||||
+ string(REPLACE "\n" ";" FILE_SCRIPTS_LIST_ "${FILE_SCRIPTS_}")
|
|
||||||
+
|
|
||||||
+ foreach(COMPARE_REGEX_ IN LISTS COMPARE_LIST)
|
|
||||||
+ unset(FOUND_)
|
|
||||||
|
|
||||||
- foreach(COMPARE_REGEX_ IN LISTS COMPARE_LIST)
|
|
||||||
- unset(FOUND_)
|
|
||||||
+ foreach(COMPARE_ IN LISTS FILE_SCRIPTS_LIST_)
|
|
||||||
+ if(COMPARE_ MATCHES "${COMPARE_REGEX_}")
|
|
||||||
+ set(FOUND_ true)
|
|
||||||
+ break()
|
|
||||||
+ endif()
|
|
||||||
+ endforeach()
|
|
||||||
|
|
||||||
- foreach(COMPARE_ IN LISTS FILE_SCRIPTS_LIST_)
|
|
||||||
- if(COMPARE_ MATCHES "${COMPARE_REGEX_}")
|
|
||||||
- set(FOUND_ true)
|
|
||||||
- break()
|
|
||||||
+ if(NOT FOUND_)
|
|
||||||
+ message(FATAL_ERROR "Missing scripts in '${FILE}'; file info: '${FILE_SCRIPTS_}'; missing: '${COMPARE_REGEX_}'")
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
-
|
|
||||||
- if(NOT FOUND_)
|
|
||||||
- message(FATAL_ERROR "Missing scripts in '${FILE}'; file info: '${FILE_SCRIPTS_}'; missing: '${COMPARE_REGEX_}'")
|
|
||||||
- endif()
|
|
||||||
- endforeach()
|
|
||||||
+ endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
-checkScripts_("${FOUND_FILE_1}" "echo \"pre install foo\";echo \"post install foo\";echo \"pre uninstall foo\";echo \"post uninstall foo\";echo \"pre trans foo\";echo \"post trans foo\"")
|
|
||||||
-checkScripts_("${FOUND_FILE_2}" "echo \"pre install\";echo \"post install\";echo \"pre uninstall\";echo \"post uninstall\";echo \"pre trans\";echo \"post trans\"")
|
|
||||||
+if(RunCMake_SUBTEST_SUFFIX MATCHES "no_scripts.*")
|
|
||||||
+ checkScripts_("${FOUND_FILE_1}" "")
|
|
||||||
+ checkScripts_("${FOUND_FILE_2}" "")
|
|
||||||
+else()
|
|
||||||
+ checkScripts_("${FOUND_FILE_1}" "echo \"pre install foo\";echo \"post install foo\";echo \"pre uninstall foo\";echo \"post uninstall foo\";echo \"pre trans foo\";echo \"post trans foo\"")
|
|
||||||
+ checkScripts_("${FOUND_FILE_2}" "echo \"pre install\";echo \"post install\";echo \"pre uninstall\";echo \"post uninstall\";echo \"pre trans\";echo \"post trans\"")
|
|
||||||
+endif()
|
|
||||||
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
index 6877c57744..ce5db0cfe8 100644
|
|
||||||
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
|
|
||||||
@@ -1,31 +1,5 @@
|
|
||||||
if(GENERATOR_TYPE STREQUAL "RPM")
|
|
||||||
- set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
|
|
||||||
- set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
|
|
||||||
- set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
|
|
||||||
- set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
|
|
||||||
- set(CPACK_RPM_PRE_TRANS_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh")
|
|
||||||
- set(CPACK_RPM_POST_TRANS_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh")
|
|
||||||
-
|
|
||||||
- set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
|
|
||||||
- set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
|
|
||||||
- set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
|
|
||||||
- set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
|
|
||||||
- set(CPACK_RPM_foo_PRE_TRANS_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
|
|
||||||
- set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
|
|
||||||
- "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
|
|
||||||
-
|
|
||||||
- if(RunCMake_SUBTEST_SUFFIX STREQUAL "single_debug_info")
|
|
||||||
+ if(RunCMake_SUBTEST_SUFFIX MATCHES ".*single_debug_info")
|
|
||||||
set(CPACK_RPM_MAIN_COMPONENT "foo")
|
|
||||||
set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
|
|
||||||
set(CPACK_RPM_FOO_FILE_NAME "RPM-DEFAULT")
|
|
||||||
@@ -34,33 +8,63 @@ endif()
|
|
||||||
|
|
||||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
|
|
||||||
|
|
||||||
-# default
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh"
|
|
||||||
- "echo \"pre install\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh"
|
|
||||||
- "echo \"post install\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh"
|
|
||||||
- "echo \"pre uninstall\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh"
|
|
||||||
- "echo \"post uninstall\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh"
|
|
||||||
- "echo \"pre trans\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh"
|
|
||||||
- "echo \"post trans\"\n")
|
|
||||||
+if(NOT RunCMake_SUBTEST_SUFFIX MATCHES "no_scripts.*")
|
|
||||||
+ if(GENERATOR_TYPE STREQUAL "RPM")
|
|
||||||
+ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
|
|
||||||
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
|
|
||||||
+ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
|
|
||||||
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
|
|
||||||
+ set(CPACK_RPM_PRE_TRANS_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh")
|
|
||||||
+ set(CPACK_RPM_POST_TRANS_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh")
|
|
||||||
+
|
|
||||||
+ set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
|
|
||||||
+ set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
|
|
||||||
+ set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
|
|
||||||
+ set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
|
|
||||||
+ set(CPACK_RPM_foo_PRE_TRANS_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
|
|
||||||
+ set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
|
|
||||||
+ "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
|
|
||||||
+ endif()
|
|
||||||
+
|
|
||||||
+ # default
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh"
|
|
||||||
+ "echo \"pre install\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh"
|
|
||||||
+ "echo \"post install\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh"
|
|
||||||
+ "echo \"pre uninstall\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh"
|
|
||||||
+ "echo \"post uninstall\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh"
|
|
||||||
+ "echo \"pre trans\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh"
|
|
||||||
+ "echo \"post trans\"\n")
|
|
||||||
|
|
||||||
-# specific
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh"
|
|
||||||
- "echo \"pre install foo\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh"
|
|
||||||
- "echo \"post install foo\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh"
|
|
||||||
- "echo \"pre uninstall foo\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh"
|
|
||||||
- "echo \"post uninstall foo\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh"
|
|
||||||
- "echo \"pre trans foo\"\n")
|
|
||||||
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh"
|
|
||||||
- "echo \"post trans foo\"\n")
|
|
||||||
+ # specific
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh"
|
|
||||||
+ "echo \"pre install foo\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh"
|
|
||||||
+ "echo \"post install foo\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh"
|
|
||||||
+ "echo \"pre uninstall foo\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh"
|
|
||||||
+ "echo \"post uninstall foo\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh"
|
|
||||||
+ "echo \"pre trans foo\"\n")
|
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh"
|
|
||||||
+ "echo \"post trans foo\"\n")
|
|
||||||
+endif()
|
|
||||||
|
|
||||||
install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo)
|
|
||||||
install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar)
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From 3a2e5547615cff5ec4eace50f4de799443f81b98 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Artur Samarin <39006-asamarin97@users.noreply.gitlab.kitware.com>
|
|
||||||
Date: Fri, 30 Jul 2021 19:38:56 +0300
|
|
||||||
Subject: [PATCH 3/3] CPackRPM: avoid a spurious `;` in the `%pre` and other
|
|
||||||
sections with scripts
|
|
||||||
|
|
||||||
This was accidentally added by commit 34c8a23044 (CPackRPM: add
|
|
||||||
scriplets tags only if scripts exist, 2021-04-01, v3.21.0-rc1~387^2).
|
|
||||||
|
|
||||||
Fixes: #22501
|
|
||||||
(cherry picked from commit 3cdf23985fc4578b719546a0e76bdcf82457477a)
|
|
||||||
---
|
|
||||||
Modules/Internal/CPack/CPackRPM.cmake | 4 +---
|
|
||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
index d4d13b8367..66a97da675 100644
|
|
||||||
--- a/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
+++ b/Modules/Internal/CPack/CPackRPM.cmake
|
|
||||||
@@ -11,9 +11,7 @@ function(set_spec_script_if_enabled TYPE PACKAGE_NAME VAR)
|
|
||||||
if(PACKAGE_NAME)
|
|
||||||
set(PACKAGE_NAME " -n ${PACKAGE_NAME}")
|
|
||||||
endif()
|
|
||||||
- set(${TYPE}_
|
|
||||||
- "%${TYPE}${PACKAGE_NAME}\n"
|
|
||||||
- "${VAR}\n" PARENT_SCOPE)
|
|
||||||
+ set(${TYPE}_ "%${TYPE}${PACKAGE_NAME}\n${VAR}\n" PARENT_SCOPE)
|
|
||||||
else()
|
|
||||||
set(${TYPE} "" PARENT_SCOPE)
|
|
||||||
endif()
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake
|
|
||||||
--- cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS 2021-03-23 10:43:17.000000000 -0500
|
|
||||||
+++ cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-03-23 13:29:14.539434722 -0500
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
|
|
||||||
|
|
||||||
-set(CPACK_THREADS 0)
|
|
||||||
+set(CPACK_THREADS 4)
|
|
||||||
|
|
||||||
if(PACKAGING_TYPE STREQUAL "COMPONENT")
|
|
||||||
set(CPACK_COMPONENTS_ALL test)
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
From 635ab930f6185d1ec3e4d99109e2edf0533b0d00 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
||||||
Date: Wed, 23 Jun 2021 21:03:15 +0200
|
|
||||||
Subject: [PATCH] testDynamicLoader: Use LIBDL_SO macro if defined.
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Starting with glibc v2.34 there is no external version of libdl.so
|
|
||||||
anymore. It has been merged into the glibc libc.so.
|
|
||||||
|
|
||||||
Assuming libdl.so will be present will break the test, thus the
|
|
||||||
LIBDL_SO macro should be used. If the macro is not defined on
|
|
||||||
the system, we ensure it will be defined using the previously
|
|
||||||
hardcoded value.
|
|
||||||
|
|
||||||
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
|
||||||
---
|
|
||||||
cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx | 14 ++++++++++++--
|
|
||||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
Index: cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx
|
|
||||||
===================================================================
|
|
||||||
--- cmake-3.21.0-rc1.orig/Source/kwsys/testDynamicLoader.cxx
|
|
||||||
+++ cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx
|
|
||||||
@@ -8,6 +8,25 @@
|
|
||||||
# include <be/kernel/OS.h> /* disable_debugger() API. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+// Needed for __GLIBC__ test macro.
|
|
||||||
+#ifdef __linux__
|
|
||||||
+# include <features.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+// Will define LIBDL_SO macro on systems with glibc.
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
+# include <gnu/lib-names.h>
|
|
||||||
+// Define to LIBC_SO, if not defined by above header.
|
|
||||||
+# ifndef LIBDL_SO
|
|
||||||
+# define LIBDL_SO LIBC_SO
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+// Define the LIBDL_SO macro, if not defined above.
|
|
||||||
+#ifndef LIBDL_SO
|
|
||||||
+# define LIBDL_SO "libdl.so"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
// Work-around CMake dependency scanning limitation. This must
|
|
||||||
// duplicate the above list of headers.
|
|
||||||
#if 0
|
|
||||||
@@ -107,8 +126,8 @@ int testDynamicLoader(int argc, char* ar
|
|
||||||
// This one is actually fun to test, since dlopen is by default
|
|
||||||
// loaded...wonder why :)
|
|
||||||
res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0);
|
|
||||||
- res += TestDynamicLoader("libdl.so", "dlopen", 1, 1, 1);
|
|
||||||
- res += TestDynamicLoader("libdl.so", "TestDynamicLoader", 1, 0, 1);
|
|
||||||
+ res += TestDynamicLoader(LIBDL_SO, "dlopen", 1, 1, 1);
|
|
||||||
+ res += TestDynamicLoader(LIBDL_SO, "TestDynamicLoader", 1, 0, 1);
|
|
||||||
#endif
|
|
||||||
// Now try on the generated library
|
|
||||||
std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload");
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
|
||||||
===================================================================
|
|
||||||
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
|
|
||||||
+++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
|
||||||
@@ -25,12 +25,14 @@ endif()
|
|
||||||
|
|
||||||
if(MINGW)
|
|
||||||
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
|
||||||
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
|
|
||||||
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
|
|
||||||
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
|
|
||||||
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
|
|
||||||
+ set(CMAKE_DL_LIBS "dl")
|
|
||||||
+else()
|
|
||||||
+ set(CMAKE_DL_LIBS "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-set(CMAKE_DL_LIBS "")
|
|
||||||
set(CMAKE_LIBRARY_PATH_FLAG "-L")
|
|
||||||
set(CMAKE_LINK_LIBRARY_FLAG "-l")
|
|
||||||
set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
|
|
||||||
27
cmake.spec
27
cmake.spec
@ -58,21 +58,21 @@
|
|||||||
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
|
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
|
||||||
|
|
||||||
%global major_version 3
|
%global major_version 3
|
||||||
%global minor_version 20
|
%global minor_version 26
|
||||||
# Set to RC version if building RC, else %%{nil}
|
# Set to RC version if building RC, else %%{nil}
|
||||||
#global rcsuf rc1
|
#global rcsuf rc1
|
||||||
%{?rcsuf:%global relsuf .%{rcsuf}}
|
%{?rcsuf:%global relsuf .%{rcsuf}}
|
||||||
%{?rcsuf:%global versuf -%{rcsuf}}
|
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||||
|
|
||||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||||
%global baserelease 9
|
%global baserelease 1
|
||||||
|
|
||||||
# Uncomment if building for EPEL
|
# Uncomment if building for EPEL
|
||||||
#global name_suffix %%{major_version}
|
#global name_suffix %%{major_version}
|
||||||
%global orig_name cmake
|
%global orig_name cmake
|
||||||
|
|
||||||
Name: %{orig_name}%{?name_suffix}
|
Name: %{orig_name}%{?name_suffix}
|
||||||
Version: %{major_version}.%{minor_version}.2
|
Version: %{major_version}.%{minor_version}.5
|
||||||
Release: %{baserelease}%{?relsuf}%{?dist}
|
Release: %{baserelease}%{?relsuf}%{?dist}
|
||||||
Summary: Cross-platform make system
|
Summary: Cross-platform make system
|
||||||
|
|
||||||
@ -103,24 +103,6 @@ Patch100: %{name}-findruby.patch
|
|||||||
%if 0%{?fedora} && 0%{?fedora} < 34
|
%if 0%{?fedora} && 0%{?fedora} < 34
|
||||||
Patch101: %{name}-fedora-flag_release.patch
|
Patch101: %{name}-fedora-flag_release.patch
|
||||||
%endif
|
%endif
|
||||||
# Add dl to CMAKE_DL_LIBS on MINGW
|
|
||||||
# https://gitlab.kitware.com/cmake/cmake/issues/17600
|
|
||||||
Patch102: %{name}-mingw-dl.patch
|
|
||||||
# memory-hungry tests when building on koji builders with *lots* of cores
|
|
||||||
# so limit it to some reasonable number (4)
|
|
||||||
Patch103: cmake-3.20-CPACK_THREADS.patch
|
|
||||||
# see rhbz#1975096
|
|
||||||
Patch104: cmake-3.20.4-glibc_libdl.patch
|
|
||||||
|
|
||||||
# rhbz#2162696
|
|
||||||
Patch105: 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch
|
|
||||||
|
|
||||||
# RHEL-14086
|
|
||||||
Patch106: 0001-CPackRPM-handle-scripts-in-debuginfo-single-package-.patch
|
|
||||||
Patch107: 0002-CPackRPM-add-scriplets-tags-only-if-scripts-exist.patch
|
|
||||||
Patch108: 0003-CPackRPM-avoid-a-spurious-in-the-pre-and-other-secti.patch
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Patch for renaming on EPEL
|
# Patch for renaming on EPEL
|
||||||
%if 0%{?name_suffix:1}
|
%if 0%{?name_suffix:1}
|
||||||
@ -541,6 +523,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 26 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-1
|
||||||
|
- Update to version 3.26.5-1
|
||||||
|
|
||||||
* Mon Oct 23 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-9
|
* Mon Oct 23 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-9
|
||||||
- Fix CPack bug with pretrans scriptlet
|
- Fix CPack bug with pretrans scriptlet
|
||||||
|
|
||||||
|
|||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cmake-3.20.2.tar.gz) = 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
|
SHA512 (cmake-3.26.5.tar.gz) = 43c17e00d6f326b96ea47c62bbffd19409281641b297b2362e4ed6a696e7e618d2ff265a213634bfa4c1200c3f581531fde6507f282a9460ab65af6c7bab61de
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user