From 3588f534dbc97f74b90ca8c7d1e9713281ae8b81 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Wed, 16 Nov 2016 18:56:56 -0800
Subject: [boost] Use --layout=system to make the output binary names simpler

---
 ports/boost/CONTROL        | 2 +-
 ports/boost/portfile.cmake | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index c96b8cf35..1aed7aa95 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,3 @@
 Source: boost
-Version: 1.62-4
+Version: 1.62-5
 Description: Peer-reviewed portable C++ source libraries
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 5dfdfb617..d3df2b8e7 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -36,6 +36,7 @@ set(B2_OPTIONS
     --hash
 
     --without-python
+    --layout=system
     toolset=msvc
     threading=multi
 )
@@ -118,7 +119,6 @@ else()
         get_filename_component(OLD_FILENAME ${LIB} NAME)
         get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
-        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME})
         file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
     endforeach()
 endif()
@@ -138,7 +138,6 @@ else()
         get_filename_component(OLD_FILENAME ${LIB} NAME)
         get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
-        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME})
         file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
     endforeach()
 endif()
-- 
cgit v1.2.3