Package: dislocker / 0.7.3+git20240607-3

wrong-libdir.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
Description: don't install to /usr/lib64 just because it exists in build env
 This package fails to build in Ubuntu and in Debian because both are
 using usrmerge in their build environments, which causes /usr/lib64 to exist
 and the upstream build system to wrongly install files to it instead of to
 /usr/lib. Patch the build system to never use /usr/lib64 as this is always
 wrong for a Debian package.
Author: Steve Langasek <steve.langasek@ubuntu.com>
Author: Sven Geuer <sge@debian.org>
Last-Update: 2025-02-09
Forwarded: https://github.com/Aorimn/dislocker/issues/300
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -174,11 +174,7 @@
 
 if(NOT DEFINED LIB_INSTALL_DIR)
 	if(NOT DEFINED libdir)
-		if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
-			set(libdir "${CMAKE_INSTALL_PREFIX}/lib64")
-		else()
-			set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
-		endif()
+		set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
 	endif()
 else()
 	set(libdir ${LIB_INSTALL_DIR})