From 46715120d25624b3af8f89177af204d793ad7d12 Mon Sep 17 00:00:00 2001 From: Weisson Date: Mon, 24 Jun 2024 16:23:37 +0800 Subject: [PATCH] sw_64 only supports that libraries in /usr/lib. Signed-off-by: Weisson --- ...ly-support-that-libraries-in-usr-lib.patch | 28 ------------------- cmake.spec | 6 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 cmake-SW-only-support-that-libraries-in-usr-lib.patch diff --git a/cmake-SW-only-support-that-libraries-in-usr-lib.patch b/cmake-SW-only-support-that-libraries-in-usr-lib.patch deleted file mode 100644 index c5f5b1e..0000000 --- a/cmake-SW-only-support-that-libraries-in-usr-lib.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ca824a680889e5a47dff17853ecf3f2999875c6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E9=97=AE=E4=B9=A6?= -Date: Wed, 30 Aug 2023 10:55:53 +0800 -Subject: [PATCH] SW only support that libraries in /usr/lib. - -Signed-off-by: Weisson ---- - Modules/GNUInstallDirs.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake -index e149f4c5..6fad0bce 100644 ---- a/Modules/GNUInstallDirs.cmake -+++ b/Modules/GNUInstallDirs.cmake -@@ -252,9 +252,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set - endif() - else() # not debian, rely on CMAKE_SIZEOF_VOID_P: - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -+ set(_LIBDIR_DEFAULT "lib") - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) -- set(__LAST_LIBDIR_DEFAULT "lib64") -+ set(__LAST_LIBDIR_DEFAULT "lib") - endif() - endif() - endif() --- -2.20.1.4621.g47101605 diff --git a/cmake.spec b/cmake.spec index e6aab89..9e9273e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -112,9 +112,6 @@ Patch1: %{name}-rename.patch %endif Patch106: cmake-add-sw.patch -%ifarch sw_64 -Patch107: cmake-SW-only-support-that-libraries-in-usr-lib.patch -%endif BuildRequires: coreutils BuildRequires: findutils @@ -299,6 +296,9 @@ tail -n +2 %{SOURCE4} >> %{name}.prov tail -n +2 %{SOURCE5} >> %{name}.req %endif +%ifarch sw_64 +sed -i 's/_LIBDIR_DEFAULT \"lib64\"/_LIBDIR_DEFAULT \"lib\"/g' Modules/GNUInstallDirs.cmake +%endif %build %if 0%{?set_build_flags:1} -- Gitee