Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-or-tools for openSUSE:Factory
checked in at 2022-07-19 17:19:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-or-tools (Old)
and /work/SRC/openSUSE:Factory/.google-or-tools.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-or-tools"
Tue Jul 19 17:19:21 2022 rev:2 rq:990006 version:9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-or-tools/google-or-tools.changes
2022-05-30 12:44:31.536436463 +0200
+++
/work/SRC/openSUSE:Factory/.google-or-tools.new.1523/google-or-tools.changes
2022-07-19 17:19:25.700371954 +0200
@@ -1,0 +2,7 @@
+Fri Jul 15 12:31:32 UTC 2022 - Stefan Br??ns <[email protected]>
+
+- Fix failing builds due to stricter RUNPATH checks, add
+ * 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch
+ * 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
+
+-------------------------------------------------------------------
New:
----
0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch
0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-or-tools.spec ++++++
--- /var/tmp/diff_new_pack.6Au1Wx/_old 2022-07-19 17:19:26.860373501 +0200
+++ /var/tmp/diff_new_pack.6Au1Wx/_new 2022-07-19 17:19:26.864373506 +0200
@@ -13,6 +13,7 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
%define sonum 9
@@ -36,6 +37,9 @@
Patch3:
https://github.com/google/or-tools/commit/672303cc2f2396c4bd5fbed8430208308815bd54.patch#/fix_malformed_Cpp.patch
# PATCH-FIX-UPSTREAM - allow build on i586/armv7
Patch4: 0001-Set-SWIGWORDSIZE-dependent-on-architecture-bitness.patch
+# PATCH-FIX-UPSTREAM - remove bad entries from RUNPATHs
+Patch5: 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch
+Patch6: 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
BuildRequires: abseil-cpp-devel
BuildRequires: cmake >= 3.18
BuildRequires: fdupes
@@ -94,8 +98,8 @@
%package devel
Summary: Suite for solving combinatorial optimization problems
Group: Development/Languages/C++
-Requires: libortools%{sonum} = %{version}
Requires: libflatzinc%{sonum} = %{version}
+Requires: libortools%{sonum} = %{version}
%description devel
Development files (C/C++) for the OR-Tools suite.
@@ -126,7 +130,6 @@
%post -n libflatzinc%{sonum} -p /sbin/ldconfig
%postun -n libflatzinc%{sonum} -p /sbin/ldconfig
-
%check
# Test using e.g. SCIP are not skipped, exclude
%if %{with tests}
++++++ 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch ++++++
>From 0806f549ac1144746917272009605e4adfd0312a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Fri, 15 Jul 2022 14:29:51 +0200
Subject: [PATCH 1/2] Only add relevant directories to sample RUNPATHs
The old code added several irrelevant, duplicate or even non-existing
directories to the RUNPATHs of the samples.
Calculate the actual relative path between binary and library install
directory (using the absolute paths, CMAKE_INSTALL_LIBDIR may be either
relative or absolute), and set it as target property.
---
cmake/cpp.cmake | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index 014244cb49..5edc74c083 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -346,20 +346,23 @@ function(add_cxx_sample FILE_NAME)
get_filename_component(COMPONENT_DIR ${SAMPLE_DIR} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
- if(APPLE)
- set(CMAKE_INSTALL_RPATH
- "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
- elseif(UNIX)
- set(CMAKE_INSTALL_RPATH
-
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
- endif()
-
add_executable(${SAMPLE_NAME} ${FILE_NAME})
target_include_directories(${SAMPLE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(${SAMPLE_NAME} PRIVATE cxx_std_17)
target_link_libraries(${SAMPLE_NAME} PRIVATE ${PROJECT_NAMESPACE}::ortools)
include(GNUInstallDirs)
+ if(APPLE)
+ set(CMAKE_INSTALL_RPATH
+ "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+ elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+ BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+ OUTPUT_VARIABLE libdir_relative_path)
+ set_target_properties(${SAMPLE_NAME} PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+ endif()
+
install(TARGETS ${SAMPLE_NAME})
if(BUILD_TESTING)
@@ -380,19 +383,23 @@ function(add_cxx_example FILE_NAME)
get_filename_component(COMPONENT_DIR ${FILE_NAME} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
- if(APPLE)
- set(CMAKE_INSTALL_RPATH
- "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
- elseif(UNIX)
- set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
- endif()
-
add_executable(${EXAMPLE_NAME} ${FILE_NAME})
target_include_directories(${EXAMPLE_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(${EXAMPLE_NAME} PRIVATE cxx_std_17)
target_link_libraries(${EXAMPLE_NAME} PRIVATE ${PROJECT_NAMESPACE}::ortools)
include(GNUInstallDirs)
+ if(APPLE)
+ set(CMAKE_INSTALL_RPATH
+ "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+ elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+ BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+ OUTPUT_VARIABLE libdir_relative_path)
+ set_target_properties(${EXAMPLE_NAME} PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+ endif()
+
install(TARGETS ${EXAMPLE_NAME})
if(BUILD_TESTING)
--
2.37.0
++++++ 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch ++++++
>From 664490070e24be6bb1849084c36f9fe234cfe3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Fri, 15 Jul 2022 17:02:31 +0200
Subject: [PATCH 2/2] Only add relevant directories to flatzinc
library/executable RUNPATHs
The flatzinc library is installed to the same location (LIBDIR) as the
ortools library, so "$ORIGIN" suffices.
The executables should use the relative path between LIBDIR and BINDIR.
---
cmake/flatzinc.cmake | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake
index 82b2fc544e..af81122ef3 100644
--- a/cmake/flatzinc.cmake
+++ b/cmake/flatzinc.cmake
@@ -102,10 +102,11 @@ add_library(${PROJECT_NAME}::flatzinc ALIAS flatzinc)
if(APPLE)
- set(CMAKE_INSTALL_RPATH
- "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+ set_target_properties(flatzinc PROPERTIES
+ INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
elseif(UNIX)
- set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
+ set_target_properties(flatzinc PROPERTIES
+ INSTALL_RPATH "$ORIGIN")
endif()
@@ -166,6 +167,17 @@ configure_file(
${PROJECT_BINARY_DIR}/ortools.msc
@ONLY)
+if(APPLE)
+ set_target_properties(fz parser_main PROPERTIES
+ INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+ BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+ OUTPUT_VARIABLE libdir_relative_path)
+ set_target_properties(fz parser_main PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
+
# Install rules
include(GNUInstallDirs)
install(TARGETS flatzinc fz parser_main
--
2.37.0
++++++ fix_malformed_Cpp.patch ++++++
--- /var/tmp/diff_new_pack.6Au1Wx/_old 2022-07-19 17:19:26.912373570 +0200
+++ /var/tmp/diff_new_pack.6Au1Wx/_new 2022-07-19 17:19:26.912373570 +0200
@@ -9,7 +9,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ortools/graph/topologicalsorter.h
b/ortools/graph/topologicalsorter.h
-index 2013d1faa1..2b7c09b681 100644
+index 2013d1faa14..2b7c09b6815 100644
--- a/ortools/graph/topologicalsorter.h
+++ b/ortools/graph/topologicalsorter.h
@@ -77,12 +77,12 @@ namespace util {
