From cd1eb0f4c9e7abd3a1372bea3a4fbcde5873ddd5247cfb3308ef7a8fd54e7034 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Sep 2020 10:31:04 +0000 Subject: [PATCH 1/2] - reapply this change: * Fix setting CMAKE_INSTALL_LIBDIR in cmake macro * This is a relative path, see `cmake --help-module GNUInstallDirs` see also https://gitlab.kitware.com/cmake/cmake/-/issues/20250 https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=427 --- cmake.changes | 10 ++++++++++ cmake.macros | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index 41c9e90..27713a7 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 14 10:29:33 UTC 2020 - Dirk Mueller + +- reapply this change: + * Fix setting CMAKE_INSTALL_LIBDIR in cmake macro + * This is a relative path, see `cmake --help-module GNUInstallDirs` + see also + https://gitlab.kitware.com/cmake/cmake/-/issues/20250 + https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244 + ------------------------------------------------------------------- Mon Aug 24 19:02:49 UTC 2020 - Dirk Mueller diff --git a/cmake.macros b/cmake.macros index 4501e31..8151b9d 100644 --- a/cmake.macros +++ b/cmake.macros @@ -23,7 +23,7 @@ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ From c6cd40e9005e98e40cfac1039ff8f8c50fede859118a14d6cb3ce8954a410cfe Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 14 Sep 2020 10:46:08 +0000 Subject: [PATCH 2/2] - reapply this change (bsc#1174581): OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=428 --- cmake.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index 27713a7..5deffc8 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Sep 14 10:29:33 UTC 2020 - Dirk Mueller -- reapply this change: +- reapply this change (bsc#1174581): * Fix setting CMAKE_INSTALL_LIBDIR in cmake macro * This is a relative path, see `cmake --help-module GNUInstallDirs` see also