From e44c1b292d194c1949445ac5bc96e1d81f11f4bf Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 17 Jan 2018 22:08:48 -0800 Subject: [PATCH] [boost] Remove version from .lib filenames to improve CMake compatibility. Fixes #2459. --- ports/boost-build/CONTROL | 2 +- ports/boost-build/Jamroot.jam | 40 ++++++++++----------- ports/boost-build/boost-modular-build.cmake | 1 + 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index 12af51a0f1..fb8d369187 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,3 @@ Source: boost-build -Version: 1.66.0-2 +Version: 1.66.0-3 Description: Boost.Build diff --git a/ports/boost-build/Jamroot.jam b/ports/boost-build/Jamroot.jam index 2762c99ea3..3c34905e5b 100644 --- a/ports/boost-build/Jamroot.jam +++ b/ports/boost-build/Jamroot.jam @@ -36,8 +36,8 @@ if "@PORT@" != "boost-system" { use-project /boost/system : . ; - lib boost_system : : @CURRENT_INSTALLED_DIR@/lib/boost_system-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_system : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_system-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_system : : @CURRENT_INSTALLED_DIR@/lib/boost_system-vc140-mt.lib release ; + lib boost_system : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_system-vc140-mt-gd.lib debug ; explicit boost_system ; } @@ -45,8 +45,8 @@ if "@PORT@" != "boost-chrono" { use-project /boost/chrono : . ; - lib boost_chrono : : @CURRENT_INSTALLED_DIR@/lib/boost_chrono-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_chrono : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_chrono-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_chrono : : @CURRENT_INSTALLED_DIR@/lib/boost_chrono-vc140-mt.lib release ; + lib boost_chrono : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_chrono-vc140-mt-gd.lib debug ; explicit boost_chrono ; } @@ -54,8 +54,8 @@ if "@PORT@" != "boost-regex" { use-project /boost/regex : . ; - lib boost_regex : : @CURRENT_INSTALLED_DIR@/lib/boost_regex-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_regex : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_regex-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_regex : : @CURRENT_INSTALLED_DIR@/lib/boost_regex-vc140-mt.lib release ; + lib boost_regex : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_regex-vc140-mt-gd.lib debug ; explicit boost_regex ; } @@ -63,8 +63,8 @@ if "@PORT@" != "boost-date-time" { use-project /boost/date_time : . ; - lib boost_date_time : : @CURRENT_INSTALLED_DIR@/lib/boost_date_time-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release -/boost/date_time//boost_date_time ; - lib boost_date_time : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_date_time-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug -/boost/date_time//boost_date_time ; + lib boost_date_time : : @CURRENT_INSTALLED_DIR@/lib/boost_date_time-vc140-mt.lib release -/boost/date_time//boost_date_time ; + lib boost_date_time : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_date_time-vc140-mt-gd.lib debug -/boost/date_time//boost_date_time ; explicit boost_date_time ; } @@ -72,8 +72,8 @@ if "@PORT@" != "boost-thread" { use-project /boost/thread : . ; - lib boost_thread : : @CURRENT_INSTALLED_DIR@/lib/boost_thread-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release : : /boost/date_time//boost_date_time ; - lib boost_thread : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_thread-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug : : /boost/date_time//boost_date_time ; + lib boost_thread : : @CURRENT_INSTALLED_DIR@/lib/boost_thread-vc140-mt.lib release : : /boost/date_time//boost_date_time ; + lib boost_thread : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_thread-vc140-mt-gd.lib debug : : /boost/date_time//boost_date_time ; explicit boost_thread ; } @@ -81,8 +81,8 @@ if "@PORT@" != "boost-timer" { use-project /boost/timer : . ; - lib boost_timer : : @CURRENT_INSTALLED_DIR@/lib/boost_timer-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_timer : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_timer-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_timer : : @CURRENT_INSTALLED_DIR@/lib/boost_timer-vc140-mt.lib release ; + lib boost_timer : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_timer-vc140-mt-gd.lib debug ; explicit boost_timer ; } @@ -90,8 +90,8 @@ if "@PORT@" != "boost-filesystem" { use-project /boost/filesystem : . ; - lib boost_filesystem : : @CURRENT_INSTALLED_DIR@/lib/boost_filesystem-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release : : /boost/system//boost_system ; - lib boost_filesystem : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_filesystem-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug : : /boost/system//boost_system ; + lib boost_filesystem : : @CURRENT_INSTALLED_DIR@/lib/boost_filesystem-vc140-mt.lib release : : /boost/system//boost_system ; + lib boost_filesystem : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_filesystem-vc140-mt-gd.lib debug : : /boost/system//boost_system ; explicit boost_filesystem ; } @@ -99,8 +99,8 @@ if "@PORT@" != "boost-atomic" { use-project /boost/atomic : . ; - lib boost_atomic : : @CURRENT_INSTALLED_DIR@/lib/boost_atomic-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_atomic : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_atomic-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_atomic : : @CURRENT_INSTALLED_DIR@/lib/boost_atomic-vc140-mt.lib release ; + lib boost_atomic : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_atomic-vc140-mt-gd.lib debug ; explicit boost_atomic ; } @@ -111,8 +111,8 @@ if "@PORT@" != "boost-context" use-project /boost/context : . ; - lib boost_context : : @CURRENT_INSTALLED_DIR@/lib/boost_context-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_context : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_context-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_context : : @CURRENT_INSTALLED_DIR@/lib/boost_context-vc140-mt.lib release ; + lib boost_context : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_context-vc140-mt-gd.lib debug ; explicit boost_context ; } @@ -120,8 +120,8 @@ if "@PORT@" != "boost-test" { use-project /boost/test : . ; - lib boost_unit_test_framework : : @CURRENT_INSTALLED_DIR@/lib/boost_unit_test_framework-vc140-mt-$(BOOST_VERSION_ABI_TAG).lib release ; - lib boost_unit_test_framework : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_unit_test_framework-vc140-mt-gd-$(BOOST_VERSION_ABI_TAG).lib debug ; + lib boost_unit_test_framework : : @CURRENT_INSTALLED_DIR@/lib/boost_unit_test_framework-vc140-mt.lib release ; + lib boost_unit_test_framework : : @CURRENT_INSTALLED_DIR@/debug/lib/boost_unit_test_framework-vc140-mt-gd.lib debug ; explicit boost_unit_test_framework ; } diff --git a/ports/boost-build/boost-modular-build.cmake b/ports/boost-build/boost-modular-build.cmake index f0d43f1b3a..a67dde31c9 100644 --- a/ports/boost-build/boost-modular-build.cmake +++ b/ports/boost-build/boost-modular-build.cmake @@ -260,6 +260,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries + string(REPLACE "-1_66" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME}) if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do