gnucash-on-osx master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue May 5 12:37:03 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/a32a6728 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/46630d63 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/faa3b427 (commit)



commit a32a67285aeb1c0851034c6d4979d0cebb15c949
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 26 14:57:25 2020 -0700

    Upgrade to the latest boost release.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index f4e9127..473dd3f 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -217,8 +217,8 @@
     </dependencies>
   </autotools>
 
-  <cmake id="boost" cmakeargs="-DLIBRARIES='date_time;regex;locale;filesystem;system'">
-    <branch module="1.68.0/source/boost_1_68_0.tar.bz2" version="1.68.0" 
+  <cmake id="boost" cmakeargs="-DLIBRARIES='date_time;regex;locale;filesystem'">
+    <branch module="1.72.0/source/boost_1_72_0.tar.bz2" version="1.72.0" 
             repo="bintray">
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/boost-cmake.patch" strip="1"/>
     </branch>

commit 46630d63b17cfb001d53583e36427f0d0b570945
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 26 14:56:47 2020 -0700

    Force boost to build for C++17.

diff --git a/patches/boost-cmake.patch b/patches/boost-cmake.patch
index 25a4958..5c8d8a3 100644
--- a/patches/boost-cmake.patch
+++ b/patches/boost-cmake.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index e69de29..b53cf7a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,71 @@
 +#CMakeLists.txt for wrapping Boost.Build in a gtk-osx jhbuild environment.
 +#Copyright 2018 John Ralls <jralls at ceridwen.us>
 +#This file is part of gtk-osx.
@@ -21,7 +21,7 @@ index e69de29..b53cf7a 100644
 +project (boost)
 +
 +if(NOT LIBRARIES)
-+  set(LIBRARIES date_time;regex;locale;filesystem)
++  set(LIBRARIES date_time;regex;locale;filesystem;system)
 +endif()
 +
 +set(B2_EXE ${CMAKE_SOURCE_DIR}/b2)
@@ -45,6 +45,7 @@ index e69de29..b53cf7a 100644
 +  --build-dir=${CMAKE_BINARY_DIR} --link-shared
 +  toolset=darwin cxxflags=${CMAKE_CXX_FLAGS}
 +  cflags=${CMAKE_C_FLAGS} linkflags=${CMAKE_SHARED_LINKER_FLAGS}
++  cxxstd=17
 +  install)
 +add_custom_target(boost_libs
 +  COMMAND ${B2_EXE} ${BUILD_FLAGS}



Summary of changes:
 modulesets/gnucash.modules | 4 ++--
 patches/boost-cmake.patch  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list