[packages/cmake] Up to 3.24.1.

arekm arekm at pld-linux.org
Thu Aug 18 12:34:20 CEST 2022


commit 050e6809c67ea28847c045b2c58c07c6e55e1915
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Aug 18 12:34:09 2022 +0200

    Up to 3.24.1.

 cmake-lib64.patch | 9 +++++----
 cmake.spec        | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index b0bcdaf..ea49c8b 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,12 +17,12 @@
 Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
-Version:	3.23.1
-Release:	3
+Version:	3.24.1
+Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://cmake.org/files/v3.23/%{name}-%{version}.tar.gz
-# Source0-md5:	b0d46fdcca030372f0a464146243e193
+Source0:	https://cmake.org/files/v3.24/%{name}-%{version}.tar.gz
+# Source0-md5:	3360abcd5576dc028204cd4583e6d4e9
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-libx32.patch
 Patch2:		%{name}-jni.patch
diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index 8eda9f7..95ec231 100644
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -11,9 +11,9 @@
  endmacro()
 --- cmake-3.1.0/Modules/FindZLIB.cmake~	2014-12-15 20:07:43.000000000 +0000
 +++ cmake-3.1.0/Modules/FindZLIB.cmake	2014-12-24 21:00:27.139263296 +0000
-@@ -85,8 +85,8 @@
- # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
- if(NOT ZLIB_LIBRARY)
+@@ -109,8 +109,8 @@ if(NOT ZLIB_LIBRARY)
+   endif()
+ 
    foreach(search ${_ZLIB_SEARCHES})
 -    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
 -    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
@@ -21,4 +21,5 @@
 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
    endforeach()
  
-   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+   # Restore the original find library ordering
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/050e6809c67ea28847c045b2c58c07c6e55e1915



More information about the pld-cvs-commit mailing list