test

Author: CryptoLover705

depends/packages/boost.mk

@@ -4,23 +4,23 @@ $(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 patch
+# Optional patch (ok to leave)
 $(package)_patches += bootstrap-clang-darwin.patch
 
+# Darwin-only libc++ v1 patch
 ifeq ($(host_os),darwin)
 $(package)_patches += use-libcxx-v1.patch
 endif
 
-
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
 $(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
+# ===== per-platform =====
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
-$(package)_config_opts_darwin=toolset=clang runtime-link=shared
+$(package)_config_opts_darwin=toolset=clang-darwin 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
@@ -31,62 +31,63 @@ $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
 
 # Darwin override
-$(package)_toolset_darwin=clang
+$(package)_toolset_darwin=clang-darwin
 $(package)_archiver_darwin=$($(package)_ar)
 
-boost_toolset_darwin=$($(package)_toolset_darwin)
-boost_archiver_darwin=$($(package)_archiver_darwin)
-
-# real library list
+# Libraries to build
 $(package)_config_libraries=chrono,filesystem,program_options,system,thread
 
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 
-# sysroot is passed by toolchain, NOT duplicated here
+# linker flags only (sysroot handled by toolchain or preprocess)
 $(package)_ldflags+= -Wl,-syslibroot,$(OSX_SDK_PATH)
 endef
 
 # ==================================================================
-# PREPROCESS
+# PREPROCESS — CREATE user-config.jam
 # ==================================================================
 
 ifeq ($(host_os),darwin)
 
 define $(package)_preprocess_cmds
-  echo "using clang : : clang++ -target x86_64-apple-darwin11 --sysroot=$(OSX_SDK_PATH) -stdlib=libc++ -mmacosx-version-min=10.8 \
-    : <cxxflags>\"$($(package)_cxxflags) -stdlib=libc++ -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
-      <linkflags>\"$($(package)_ldflags) -stdlib=libc++\" \
-      <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
+        : <cxxflags>\"$($(package)_cxxflags)\" \
+          <linkflags>\"$($(package)_ldflags)\" \
+          <archiver>\"$($(package)_ar)\" \
+          <ranlib>\"$(host_RANLIB)\" \
+          <striper>\"$(host_STRIP)\" \
+        ;" > user-config.jam
 endef
 
 endif
 
 # ==================================================================
-# CONFIG — BUILD B2 ENGINE WITH HOST COMPILER
+# CONFIG — BUILD B2 ENGINE
 # ==================================================================
 
 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=gcc \
+      --with-toolset=clang-darwin \
       --with-libraries=$($(package)_config_libraries) \
     || ( echo "=== BOOST BOOTSTRAP.LOG ===" \
          && cat bootstrap.log \
@@ -108,9 +109,11 @@ endif
 # ==================================================================
 
 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

depends/packages/qt.mk

@@ -11,6 +11,11 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
 $(package)_patches+=fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
 
+ifeq ($(host_os),darwin)
+$(package)_patches += fix-darwin-cpp-headers.patch
+endif
+
+
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
 

depends/patches/qt/fix-darwin-cpp-headers.patch

@@ -0,0 +1,8 @@
+--- a/mkspecs/common/clang.conf
++++ b/mkspecs/common/clang.conf
+@@ -10,7 +10,7 @@
+ QMAKE_CXXFLAGS += -stdlib=libc++ 
+ QMAKE_LFLAGS   += -stdlib=libc++
+ 
+-QMAKE_CXXFLAGS += -isystem $$[QT_SYSROOT]/usr/include/c++/4.2.1
++QMAKE_CXXFLAGS += -isystem $$[QT_SYSROOT]/usr/include/c++/v1