aboutsummaryrefslogtreecommitdiffstats
path: root/main/cmake/patch-adjust-lib64.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/cmake/patch-adjust-lib64.patch')
-rw-r--r--main/cmake/patch-adjust-lib64.patch41
1 files changed, 11 insertions, 30 deletions
diff --git a/main/cmake/patch-adjust-lib64.patch b/main/cmake/patch-adjust-lib64.patch
index 251bcaa10d..1dfd619ea6 100644
--- a/main/cmake/patch-adjust-lib64.patch
+++ b/main/cmake/patch-adjust-lib64.patch
@@ -1,31 +1,12 @@
---- cmake-3.19.5/Modules/GNUInstallDirs.cmake.orig
-+++ cmake-3.19.5/Modules/GNUInstallDirs.cmake
-@@ -224,28 +224,6 @@
- "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including GNUInstallDirs.")
+diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
+index f7d8c36a26..d81033ca90 100644
+--- a/Modules/GNUInstallDirs.cmake
++++ b/Modules/GNUInstallDirs.cmake
+@@ -239,6 +239,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
endif()
-- if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-- AND NOT CMAKE_CROSSCOMPILING
-- AND NOT EXISTS "/etc/arch-release")
-- if (EXISTS "/etc/debian_version") # is this a debian system ?
-- if(CMAKE_LIBRARY_ARCHITECTURE)
-- if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-- endif()
-- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
-- AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-- set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-- endif()
-- endif()
-- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
-- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-- set(_LIBDIR_DEFAULT "lib64")
-- if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
-- set(__LAST_LIBDIR_DEFAULT "lib64")
-- endif()
-- endif()
-- endif()
-- endif()
- if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
- elseif(DEFINED __LAST_LIBDIR_DEFAULT
+ if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+ AND NOT CMAKE_CROSSCOMPILING
++ AND NOT EXISTS "/etc/alpine-release"
+ AND NOT EXISTS "/etc/arch-release")
+ if (EXISTS "/etc/debian_version") # is this a debian system ?
+ if(CMAKE_LIBRARY_ARCHITECTURE)