From 81cc4b6432faf71d0cbf5441cad42c459063f60d Mon Sep 17 00:00:00 2001
From: FireMartZ <martindube@martindube.com>
Date: Fri, 2 Mar 2018 22:36:37 -0500
Subject: [PATCH] WIP: Merge more build mk files.

---
 depends/packages/boost.mk      | 8 ++++----
 depends/packages/googlemock.mk | 6 ------
 depends/packages/googletest.mk | 7 -------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 9f8f50a40..0c545c4d5 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -11,14 +11,14 @@ $(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
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
-$(package)_config_opts_darwin=--toolset=gcc threadapi=pthread runtime-link=shared
+$(package)_config_opts_darwin=--toolset=darwin-4.2.1 runtime-link=shared
 $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
 $(package)_config_opts_x86_64_mingw32=address-model=64
 $(package)_config_opts_i686_mingw32=address-model=32
 $(package)_config_opts_i686_linux=address-model=32 architecture=x86
 $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
-$(package)_toolset_darwin=gcc
+$(package)_toolset_darwin=darwin
 $(package)_archiver_darwin=$($(package)_libtool)
 $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
@@ -36,9 +36,9 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) cxxflags=-std=c++11 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) cxxflags=-std=c++11 install
+  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
 endef
diff --git a/depends/packages/googlemock.mk b/depends/packages/googlemock.mk
index 8d7954b9b..229dc3587 100644
--- a/depends/packages/googlemock.mk
+++ b/depends/packages/googlemock.mk
@@ -13,12 +13,6 @@ define $(package)_build_cmds
   $(MAKE) -C make GTEST_DIR='$(host_prefix)' CXXFLAGS='-fPIC' gmock-all.o
 endef
 
-BUILD_OS := $(shell uname)
-ifeq ($(BUILD_OS),Darwin)
-    $(package)_install=ginstall
-else
-    $(package)_install=install
-endif
 
 define $(package)_stage_cmds
   install -D ./make/gmock-all.o $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk
index 35ef24830..b10ce89eb 100644
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -5,13 +5,6 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=release-$($(package)_version).tar.gz
 $(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
 
-BUILD_OS := $(shell uname)
-ifeq ($(BUILD_OS),Darwin)
-    $(package)_install=ginstall
-else
-    $(package)_install=install
-endif
-
 define $(package)_build_cmds
   $(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \
   $(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a