From 56c3febc9de168df0707269e48d31701f60e7673 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 16 Nov 2016 19:26:37 -0800
Subject: [boost] Also rename lib files in dynamic builds (conditionally)

i.e. for libboost_xxx.lib, if boost_xxx.lib exists, delete
libboost_xxx.lib otherwise rename it to boost_xxx.lib
---
 ports/boost/CONTROL        |  2 +-
 ports/boost/portfile.cmake | 34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 1aed7aa95..57dfe58e3 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,3 @@
 Source: boost
-Version: 1.62-5
+Version: 1.62-6
 Description: Peer-reviewed portable C++ source libraries
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index d3df2b8e7..7cc0d60b0 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -101,10 +101,24 @@ 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")
 
+function(boost_remove_lib_prefix_from_lib_files 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()
+    endforeach()
+endfunction()
+
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel")
 file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib
@@ -113,15 +127,9 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage/lib/
         DESTINATION ${CURRENT_PACKAGES_DIR}/bin
         FILES_MATCHING PATTERN "*.dll")
-else()
-    file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
-    foreach(LIB ${RELEASE_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})
-        file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-    endforeach()
 endif()
+file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
+boost_remove_lib_prefix_from_lib_files(RELEASE_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
 
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
@@ -132,15 +140,9 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage/lib/
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
         FILES_MATCHING PATTERN "*.dll")
-else()
-    file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
-    foreach(LIB ${DEBUG_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})
-        file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-    endforeach()
 endif()
+file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
+boost_remove_lib_prefix_from_lib_files(DEBUG_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
 
 vcpkg_copy_pdbs()
-- 
cgit v1.2.3