Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package minisat for openSUSE:Factory checked
in at 2022-08-03 21:16:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/minisat (Old)
and /work/SRC/openSUSE:Factory/.minisat.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minisat"
Wed Aug 3 21:16:53 2022 rev:6 rq:992468 version:2.2.1+20200902
Changes:
--------
--- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2022-07-26
19:45:33.785247818 +0200
+++ /work/SRC/openSUSE:Factory/.minisat.new.1533/minisat.changes
2022-08-03 21:17:09.875515543 +0200
@@ -2 +2 @@
-Tue Jul 26 04:31:49 UTC 2022 - Jiri Slaby <jsl...@suse.cz>
+Wed Jul 27 07:30:00 UTC 2022 - Jiri Slaby <jsl...@suse.cz>
@@ -4 +4,2 @@
-- fix rpath (don't use relative lib64)
+- add CMakeLists-use-absolute-libdir-in-rpath-handling.patch
+ (fix rpath (don't use relative lib64))
New:
----
CMakeLists-use-absolute-libdir-in-rpath-handling.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ minisat.spec ++++++
--- /var/tmp/diff_new_pack.QFk1JT/_old 2022-08-03 21:17:10.571517369 +0200
+++ /var/tmp/diff_new_pack.QFk1JT/_new 2022-08-03 21:17:10.587517411 +0200
@@ -24,7 +24,8 @@
License: MIT
Group: Development/Tools/Other
Source0: %{name}-%{version}.tar.xz
-Patch0: 0001-CMakeLists-support-different-lib-dirs.patch
+Patch0: CMakeLists-use-absolute-libdir-in-rpath-handling.patch
+Patch1: 0001-CMakeLists-support-different-lib-dirs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -67,9 +68,7 @@
%build
%define __builder ninja
-%cmake -DMINISAT_INSTALL_CMAKE_DIR=%{_libdir}/cmake/%{name} \
- -DCMAKE_INSTALL_LIBDIR:PATH=%{_prefix}/%{_lib}
-# bug in CMakeLists.txt, it looks up absolute paths only ^^
+%cmake -DMINISAT_INSTALL_CMAKE_DIR=%{_libdir}/cmake/%{name}
%make_jobs
%install
++++++ 0001-CMakeLists-support-different-lib-dirs.patch ++++++
--- /var/tmp/diff_new_pack.QFk1JT/_old 2022-08-03 21:17:10.615517485 +0200
+++ /var/tmp/diff_new_pack.QFk1JT/_new 2022-08-03 21:17:10.623517506 +0200
@@ -14,12 +14,7 @@
index 465fd913..10c8bf08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -220,11 +220,13 @@ set_target_properties(minisat_simp PROPERTIES
OUTPUT_NAME "minisat")
-
#--------------------------------------------------------------------------------------------------
- # Installation targets:
-
-+set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Output directory for libraries")
-+
+@@ -220,8 +220,8 @@ set_target_properties(minisat_simp PROPERTIES
OUTPUT_NAME "minisat")
install(TARGETS minisat minisat_core minisat_simp
EXPORT ${MINISAT_EXPORT_NAME}
RUNTIME DESTINATION bin
++++++ CMakeLists-use-absolute-libdir-in-rpath-handling.patch ++++++
From: Jiri Slaby <jsl...@suse.cz>
Date: Wed, 27 Jul 2022 09:22:37 +0200
Subject: CMakeLists: use absolute libdir in rpath handling
Patch-mainline: no
References: rpath fix
The original rpath handling in the wiki[1] uses
"${CMAKE_INSTALL_PREFIX}/lib". But here, "${CMAKE_INSTALL_LIBDIR}" is
used. While the former is absolute, the latter needs not. That causes
troubles as rpath can be set to something like "lib64" only. That is
bogus.
So fix this by using absolute "${CMAKE_INSTALL_FULL_LIBDIR}" from
GNUInstallDirs and handles the paths correctly.
[1]
https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#always-full-rpath
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 465fd913..1a0bf286 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ find_package(ZLIB)
include_directories(${ZLIB_INCLUDE_DIR})
include_directories(${minisat_SOURCE_DIR})
include (GenerateExportHeader)
+include(GNUInstallDirs)
#--------------------------------------------------------------------------------------------------
# Compile flags:
@@ -76,16 +77,16 @@ else ()
# (but later on when installing)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# the RPATH to be used when installing, but only if it's not a system
directory
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_LIBDIR}" isSystemDir)
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
ENDIF("${isSystemDir}" STREQUAL "-1")
if (APPLE)
--
2.35.3
