[med-svn] [Git][med-team/savvy][master] 2 commits: Add patch to fix i386 build

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / savvy


Commits:
22bbf653 by Nilesh Patra at 2022-10-15T16:19:23+05:30
Add patch to fix i386 build

- - - - -
0e15fd00 by Nilesh Patra at 2022-10-15T16:19:52+05:30
d/ch for next upload

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/remove-arch-check.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+savvy (2.1.0-2) UNRELEASED; urgency=medium
+
+  * Team Upload.
+  * Add patch to fix i386 build
+
+ -- Nilesh Patra <nilesh at debian.org>  Sat, 15 Oct 2022 16:19:28 +0530
+
 savvy (2.1.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #1021788)


=====================================
debian/patches/remove-arch-check.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Cmake tries to detect 32/64 bit arch to make sure we are not mixing this
+ during the build. In this case, this check is applied for shrinkwrap which is a header
+ only lib, so such a check is irrelevant.
+ Thanks to https://github.com/doctest/doctest/pull/225 for helping with reasoning
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2022-10-15
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,7 @@
+ #    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;${CMAKE_FIND_LIBRARY_SUFFIXES}") # Prefer libz.a when both are available
+ #endif()
+ 
++unset(CMAKE_SIZEOF_VOID_P)
+ find_library(ZLIB_LIBRARY z)
+ find_library(ZSTD_LIBRARY zstd)
+ find_package(shrinkwrap REQUIRED)


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 enable_zstd.patch
+remove-arch-check.patch



View it on GitLab: https://salsa.debian.org/med-team/savvy/-/compare/e38501e011374ec5a6ad82a37f07b021ef29e54d...0e15fd004399181666ee333055ac9b8825c4b54a

-- 
View it on GitLab: https://salsa.debian.org/med-team/savvy/-/compare/e38501e011374ec5a6ad82a37f07b021ef29e54d...0e15fd004399181666ee333055ac9b8825c4b54a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221015/277e292e/attachment-0001.htm>