From 7de87c1851c6ff53163ef76376f8037af12caa5c Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 5 Jun 2019 01:40:40 +0300 Subject: [PATCH 1/4] trying to fix macos build issue --- utils/macosx_fix_boost_libs_path.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh index b42f6fcba..4a43d8b45 100644 --- a/utils/macosx_fix_boost_libs_path.sh +++ b/utils/macosx_fix_boost_libs_path.sh @@ -27,6 +27,7 @@ function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fi install_name_tool -change libboost_atomic.dylib $1/libboost_atomic.dylib $2 install_name_tool -change libboost_program_options.dylib $1/libboost_program_options.dylib $2 install_name_tool -change libboost_locale.dylib $1/libboost_locale.dylib $2 + install_name_tool -change libboost_timer.dylib $1/libboost_timer.dylib $2 return 0 } From efdcd51f9958d0151f22f0393e2c6f20475ebbbd Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 5 Jun 2019 02:13:07 +0300 Subject: [PATCH 2/4] trying to fix macos build issue (2) --- utils/macosx_fix_boost_libs_path.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh index 4a43d8b45..64730785f 100644 --- a/utils/macosx_fix_boost_libs_path.sh +++ b/utils/macosx_fix_boost_libs_path.sh @@ -28,6 +28,7 @@ function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fi install_name_tool -change libboost_program_options.dylib $1/libboost_program_options.dylib $2 install_name_tool -change libboost_locale.dylib $1/libboost_locale.dylib $2 install_name_tool -change libboost_timer.dylib $1/libboost_timer.dylib $2 + install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2 return 0 } From 4a923250370612c474681efe037f236fcb0c905a Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 5 Jun 2019 12:53:09 +0300 Subject: [PATCH 3/4] trying to fix macos build issue (3) --- utils/macosx_fix_boost_libs_path.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh index 64730785f..ff290d923 100644 --- a/utils/macosx_fix_boost_libs_path.sh +++ b/utils/macosx_fix_boost_libs_path.sh @@ -37,6 +37,8 @@ function fix_boost_libs_in_libs() # $1 - path to boost libs, $2 - path to libs f install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_filesystem.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_thread.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_chrono.dylib + install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_timer.dylib + install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2/libboost_timer.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_locale.dylib } From 2b332610bbd631809b3dacbc881b99c5474f6bfe Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 5 Jun 2019 13:48:05 +0300 Subject: [PATCH 4/4] === build number: 37 -> 38 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 18c2fd477..13d245d2d 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -2,6 +2,6 @@ #define BUILD_COMMIT_ID "@VERSION@" #define PROJECT_VERSION "1.0" -#define PROJECT_VERSION_BUILD_NO 37 +#define PROJECT_VERSION_BUILD_NO 38 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"