Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package stp for openSUSE:Factory checked in at 2022-08-03 21:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stp (Old) and /work/SRC/openSUSE:Factory/.stp.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stp" Wed Aug 3 21:16:46 2022 rev:13 rq:992451 version:2.3.3+20220722 Changes: -------- --- /work/SRC/openSUSE:Factory/stp/stp.changes 2022-07-26 19:45:35.169033989 +0200 +++ /work/SRC/openSUSE:Factory/.stp.new.1533/stp.changes 2022-08-03 21:17:02.511496216 +0200 @@ -1,0 +2,5 @@ +Wed Jul 27 06:45:36 UTC 2022 - Jiri Slaby <[email protected]> + +- add CMakeLists-use-absolute-libdir-in-rpath-handling.patch + +------------------------------------------------------------------- New: ---- CMakeLists-use-absolute-libdir-in-rpath-handling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stp.spec ++++++ --- /var/tmp/diff_new_pack.otRE5R/_old 2022-08-03 21:17:03.099497759 +0200 +++ /var/tmp/diff_new_pack.otRE5R/_new 2022-08-03 21:17:03.103497770 +0200 @@ -25,6 +25,7 @@ URL: https://github.com/stp/stp/wiki Source0: %{name}-%{version}.tar.xz Patch0: py3.patch +Patch1: CMakeLists-use-absolute-libdir-in-rpath-handling.patch BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -88,9 +89,7 @@ %cmake \ -DPython_ADDITIONAL_VERSIONS=3 \ -DALSO_BUILD_STATIC_LIB:BOOL="off" \ - -DSTP_TIMESTAMPS:BOOL="off" \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_prefix}/%{_lib} -# bug in CMakeLists.txt, it looks up absolute paths only ^^ + -DSTP_TIMESTAMPS:BOOL="off" %cmake_build %install ++++++ CMakeLists-use-absolute-libdir-in-rpath-handling.patch ++++++ From: Jiri Slaby <[email protected]> Date: Wed, 27 Jul 2022 07:25:50 +0200 Subject: CMakeLists: use absolute libdir in rpath handling Patch-mainline: https://github.com/stp/stp/pull/438 References: rpath fix Commit a26083b634fe (Fixing libdirs for CMakeLists) switched from "${CMAKE_INSTALL_PREFIX}/lib" to "${CMAKE_INSTALL_LIBDIR}". It fixed the issue with lib vs lib64. But 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 which is already included and handles the paths correctly. Fixes #437. Signed-off-by: Jiri Slaby <[email protected]> --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dd1db71..400292d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,16 +181,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
