Mercurial > hg > orthanc

changeset 5062:caed453042db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix static compilation of boost 1.69 on Ubuntu 22.04
author Alain Mazy <am@osimis.io>
date Thu, 11 Aug 2022 09:33:20 +0200
parents e95fadefeb72
children cfbf45e76468
files NEWS OrthancFramework/Resources/Patches/boost-1.69.0-linux-standard-base.patch
diffstat 2 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Aug 09 17:57:38 2022 +0200
+++ b/NEWS	Thu Aug 11 09:33:20 2022 +0200
@@ -23,6 +23,7 @@
 * DelayedDeletion plugin: Fix leaking of symbols
 * SQLite now closes and deletes WAL and SHM files on exit.  This should improve
   handling of SQLite DB over network drives.
+* Fix static compilation of boost 1.69 on Ubuntu 22.04
 
 
 Version 1.11.1 (2022-06-30)
--- a/OrthancFramework/Resources/Patches/boost-1.69.0-linux-standard-base.patch	Tue Aug 09 17:57:38 2022 +0200
+++ b/OrthancFramework/Resources/Patches/boost-1.69.0-linux-standard-base.patch	Thu Aug 11 09:33:20 2022 +0200
@@ -121,3 +121,16 @@
      std::strcpy(entry->d_name, p->d_name);
      *result = entry;
      return 0;
+
+diff -urEb boost_1_69_0.orig/boost/thread/pthread/thread_data.hpp boost_1_69_0/boost/thread/pthread/thread_data.hpp 
+--- boost_1_69_0.orig/boost/thread/pthread/thread_data.hpp      2022-08-11 07:26:14.343376000 +0000
++++ boost_1_69_0/boost/thread/pthread/thread_data.hpp   2022-08-11 07:27:21.009862000 +0000
+@@ -57,7 +57,7 @@
+ #else
+           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
+ #endif
+-#if PTHREAD_STACK_MIN > 0
++#ifdef PTHREAD_STACK_MIN
+           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+ #endif
+           size = ((size+page_size-1)/page_size)*page_size;
\ No newline at end of file