diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 20:20:43 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 20:20:43 +0100 |
| commit | 401facbb430fa84882171f267e081f6da3463b13 (patch) | |
| tree | a6a425b6e9b6ae4430fd15794beba9d636a67703 /debian/patches | |
| parent | 316e551a45c5d251d5679837ee308a0f6ced593f (diff) | |
New d/p/0005-fix_link_lib_failed.patch
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0005-fix_link_lib_failed.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/0005-fix_link_lib_failed.patch b/debian/patches/0005-fix_link_lib_failed.patch new file mode 100644 index 0000000..23deba2 --- /dev/null +++ b/debian/patches/0005-fix_link_lib_failed.patch @@ -0,0 +1,41 @@ +Description: fix_xtrkcad_build_failure +Author: Yue Gui <yuemeng.gui@gmail.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087474 +Forwarded: not-needed +Last-Update: 2024-11-14 <YYYY-MM-DD, last update of the meta-information, optional> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMake/FindLibzip.cmake ++++ b/CMake/FindLibzip.cmake +@@ -37,17 +37,23 @@ + HINTS ${PC_LIBZIP_INCLUDE_DIRS})
+
+ if(UNIX AND NOT APPLE)
++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ find_library(LIBZIP_LIBRARY
+ NAMES libzip.a zip
+ PATHS
+- /usr/lib64
+- /usr/lib
+- /usr/local/lib64
+- /usr/local/lib
+- /sw/lib
+- /opt/local/lib
+- ${CMAKE_CURRENT_SOURCE_DIR}/app/tools/lib/linux
+- )
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib64
++ /usr/local/lib
++ /sw/lib
++ /opt/local/lib
++ ${CMAKE_CURRENT_SOURCE_DIR}/app/tools/lib/linux
++ )
++ else()
++ find_library(LIBZIP_LIBRARY
++ NAMES zip
++ )
++ endif()
+ else()
+ find_library(LIBZIP_LIBRARY
+ NAMES zip)
diff --git a/debian/patches/series b/debian/patches/series index 0f9e10d..086db6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ #0001-usr_gtk-3.patch #0900-spelling-errors.patch +0005-fix_link_lib_failed.patch |