From 8e911397c5a7e9796714431e9f87787dfd234fcc Mon Sep 17 00:00:00 2001 From: Manuel Massing Date: Mon, 21 Nov 2016 11:43:23 +0100 Subject: [boost] Build boost with zlib support --- ports/boost/CONTROL | 1 + ports/boost/portfile.cmake | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'ports/boost') diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 57dfe58e3..8f5fcbb39 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,4 @@ Source: boost Version: 1.62-6 Description: Peer-reviewed portable C++ source libraries +Build-Depends: zlib diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 7cc0d60b0..5b488c697 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -31,6 +31,10 @@ endif() message(STATUS "Bootstrapping done") set(B2_OPTIONS + -sZLIB_BINARY=zlib + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include" + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" + -sNO_BZIP2=1 -j$ENV{NUMBER_OF_PROCESSORS} --debug-configuration --hash -- cgit v1.2.3 From 447995519319c80cefd0c612c49aa005ab2586d3 Mon Sep 17 00:00:00 2001 From: Manuel Massing Date: Fri, 25 Nov 2016 15:58:57 +0100 Subject: [boost] Link against correct version of zlib when building debug variant. --- ports/boost/portfile.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'ports/boost') diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 5b488c697..050418afc 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -65,6 +65,15 @@ if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}) endif() +# Add build type specific options +set(B2_OPTIONS_DBG + ${B2_OPTIONS} + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib" +) +set(B2_OPTIONS_REL + ${B2_OPTIONS} + -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib" +) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) @@ -74,7 +83,7 @@ vcpkg_execute_required_process_repeat( COMMAND "${SOURCE_PATH}/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ${B2_OPTIONS} + ${B2_OPTIONS_REL} variant=release debug-symbols=on WORKING_DIRECTORY ${SOURCE_PATH} @@ -87,7 +96,7 @@ vcpkg_execute_required_process_repeat( COMMAND "${SOURCE_PATH}/b2.exe" --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - ${B2_OPTIONS} + ${B2_OPTIONS_DBG} variant=debug WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME build-${TARGET_TRIPLET}-dbg -- cgit v1.2.3 From ff4d33b156e06b5457837361b28803fb8570d350 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 5 Dec 2016 16:42:30 -0800 Subject: [boost] Don't use --layout=system. Resolves #369 --- ports/boost/CONTROL | 2 +- ports/boost/portfile.cmake | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'ports/boost') diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 57dfe58e3..91c8496a5 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,3 @@ Source: boost -Version: 1.62-6 +Version: 1.62-7 Description: Peer-reviewed portable C++ source libraries diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 7cc0d60b0..67d9096ac 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -36,7 +36,6 @@ set(B2_OPTIONS --hash --without-python - --layout=system toolset=msvc threading=multi ) @@ -106,16 +105,16 @@ file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOO file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") -function(boost_remove_lib_prefix_from_lib_files LIBS) +# This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default. +# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_62.lib). +function(boost_rename_libs LIBS) foreach(LIB ${${LIBS}}) get_filename_component(OLD_FILENAME ${LIB} NAME) get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) - if (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) - file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}) - else() - file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) - endif() + string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs + string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs + file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) endforeach() endfunction() @@ -129,7 +128,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) FILES_MATCHING PATTERN "*.dll") endif() file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib) -boost_remove_lib_prefix_from_lib_files(RELEASE_LIBS) +boost_rename_libs(RELEASE_LIBS) message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") @@ -142,7 +141,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) FILES_MATCHING PATTERN "*.dll") endif() file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib) -boost_remove_lib_prefix_from_lib_files(DEBUG_LIBS) +boost_rename_libs(DEBUG_LIBS) message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") vcpkg_copy_pdbs() -- cgit v1.2.3 From a545be80b4a5388e6cfde1ab9cd554bcaede4065 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 6 Dec 2016 13:48:37 -0800 Subject: [boost] Fix dynamic build lib renaming --- ports/boost/CONTROL | 2 +- ports/boost/portfile.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'ports/boost') diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 91c8496a5..52273d80e 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,3 +1,3 @@ Source: boost -Version: 1.62-7 +Version: 1.62-8 Description: Peer-reviewed portable C++ source libraries diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 67d9096ac..f9d70554a 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -114,7 +114,11 @@ function(boost_rename_libs LIBS) string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs - file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) + if (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) + file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}) + else() + file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) + endif() endforeach() endfunction() -- cgit v1.2.3 From 31b713ca1fe74f784f01cdc6ed0cfdaf4a5fcaf7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 7 Dec 2016 21:40:36 -0800 Subject: [vcpkg] Remove all instances of TRIPLET_SYSTEM_NAME; use VCPKG_CMAKE_SYSTEM_NAME instead. --- ports/boost/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/boost') diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index f9d70554a..fcf60402b 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -55,7 +55,7 @@ endif() if(TRIPLET_SYSTEM_ARCH MATCHES "x64") list(APPEND B2_OPTIONS address-model=64) endif() -if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") +if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") list(APPEND B2_OPTIONS windows-api=store) set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}) endif() -- cgit v1.2.3 From 2307fa6274326cfaaf49303f728bdededa436a93 Mon Sep 17 00:00:00 2001 From: codeandroid Date: Thu, 8 Dec 2016 17:03:45 +0100 Subject: [boost] unset BOOST_AUTO_LINK_NOMANGLE flag (fixes #397). This was a remnant of a previously enabled system install option which has been disabled in the meantime. --- ports/boost/portfile.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'ports/boost') diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index fcf60402b..3c408bca7 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -100,7 +100,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) "\n#define BOOST_ALL_DYN_LINK\n" ) endif() -file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_AUTO_LINK_NOMANGLE\n") file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright) message(STATUS "Packaging headers done") -- cgit v1.2.3 From 6507a1ea321effda7c0c2ffc8cdc4982bac1b5d5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 14 Dec 2016 12:25:34 -0800 Subject: [boost] Bump version --- ports/boost/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/boost') diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index ab7f87cc1..9e2afdf8a 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.62-8 +Version: 1.62-9 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib -- cgit v1.2.3