Update boost.mk

Author: CryptoLover705

depends/packages/boost.mk

@@ -4,7 +4,7 @@ $(package)_download_path=https://archives.boost.io/release/1.74.0/source/
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 $(package)_sha256_hash=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
 
-# Optional existing patch
+# Optional patch (ok to leave)
 $(package)_patches += bootstrap-clang-darwin.patch
 
 ifeq ($(host_os),darwin)
@@ -17,7 +17,6 @@ $(package)_config_opts_debug=variant=debug
 $(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam
 $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
 
-# Per-platform
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
 $(package)_config_opts_darwin=toolset=clang-darwin runtime-link=shared
 
@@ -29,7 +28,6 @@ $(package)_config_opts_i686_linux=address-model=32 architecture=x86
 $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
 
-# macOS override
 $(package)_toolset_darwin=clang-darwin
 $(package)_archiver_darwin=$($(package)_ar)
 
@@ -41,73 +39,66 @@ $(package)_cxxflags_linux=-fPIC
 $(package)_ldflags+= -Wl,-syslibroot,$(OSX_SDK_PATH)
 endef
 
-
-# ==================================================================
-# PREPROCESS — Create user-config.jam
-# ==================================================================
-
 ifeq ($(host_os),darwin)
 
 define $(package)_preprocess_cmds
-echo "using clang-darwin : : clang++ -target x86_64-apple-darwin11 --sysroot=$(OSX_SDK_PATH) -mmacosx-version-min=10.8 -stdlib=libc++ \
-    : <cxxflags>\"-nostdinc++ -std=c++11 -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
-      <linkflags>\"-stdlib=libc++ -Wl,-syslibroot,$(OSX_SDK_PATH)\" \
-      <archiver>\"$(host_AR)\" \
-      <ranlib>\"$(host_RANLIB)\" \
-      <striper>\"$(host_STRIP)\" ;" > user-config.jam
+  echo "using clang-darwin : : clang++ -target x86_64-apple-darwin11 \
+        --sysroot=$(OSX_SDK_PATH) \
+        -mmacosx-version-min=10.8 \
+        -stdlib=libc++ \
+        : <cxxflags>\"-nostdinc++ -std=c++11 \
+            -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
+          <linkflags>\"-stdlib=libc++ -Wl,-syslibroot,$(OSX_SDK_PATH)\" \
+          <archiver>\"$(host_AR)\" \
+          <ranlib>\"$(host_RANLIB)\" \
+          <striper>\"$(host_STRIP)\" \
+        ;" > user-config.jam
 endef
 
 else
 
 define $(package)_preprocess_cmds
-echo "using gcc : : $($(package)_cxx) \
-    : <cxxflags>\"$($(package)_cxxflags)\" \
-      <linkflags>\"$($(package)_ldflags)\" \
-      <archiver>\"$($(package)_ar)\" \
-      <ranlib>\"$(host_RANLIB)\" \
-      <striper>\"$(host_STRIP)\" ;" > user-config.jam
+  echo "using gcc : : $($(package)_cxx) \
+        : <cxxflags>\"$($(package)_cxxflags)\" \
+          <linkflags>\"$($(package)_ldflags)\" \
+          <archiver>\"$($(package)_ar)\" \
+          <ranlib>\"$(host_RANLIB)\" \
+          <striper>\"$(host_STRIP)\" \
+        ;" > user-config.jam
 endef
 
 endif
 
-
-# ==================================================================
-# CONFIG — Bootstrap B2
-# ==================================================================
-
 ifeq ($(host_os),darwin)
 
 define $(package)_config_cmds
-PATH="$(BOOST_NO_WRAP_PATH)" CC="$(CC_FOR_BUILD)" CXX="$(CXX_FOR_BUILD)" ./bootstrap.sh \
-    --without-icu \
-    --with-toolset=clang-darwin \
-    --with-libraries=$($(package)_config_libraries) \
-  || ( echo "=== BOOST BOOTSTRAP.LOG ===" && cat bootstrap.log && echo "=== END ===" && false )
-
-# Remove Boost auto-generated toolset to avoid duplicate definitions
-sed -i '/using clang-darwin/d' project-config.jam
+  PATH="$(BOOST_NO_WRAP_PATH)" CC="$(CC_FOR_BUILD)" CXX="$(CXX_FOR_BUILD)" \
+    ./bootstrap.sh --without-icu \
+      --with-toolset=clang-darwin \
+      --with-libraries=$($(package)_config_libraries) \
+    || ( echo "=== BOOST BOOTSTRAP.LOG ===" \
+         && cat bootstrap.log \
+         && echo "=== END BOOST BOOTSTRAP.LOG ===" \
+         && false )
+
+  sed -i '/using clang-darwin/d' project-config.jam
 endef
 
 else
 
 define $(package)_config_cmds
-./bootstrap.sh --without-icu \
+  ./bootstrap.sh --without-icu \
     --with-libraries=$($(package)_config_libraries)
 endef
 
 endif
 
-
-# ==================================================================
-# BUILD + INSTALL
-# ==================================================================
-
 define $(package)_build_cmds
-./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) \
-    $($(package)_config_opts) stage
+  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) \
+      $($(package)_config_opts) stage
 endef
 
 define $(package)_stage_cmds
-./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) \
-    $($(package)_config_opts) install
+  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) \
+      $($(package)_config_opts) install
 endef