sailer pushed to mingw-boost (f22). "avoid context ambiguity"

[notifications at fedoraproject.org]

From f1a4fefcbfc23cca96bf6a5d15a7bdc02af159a7 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Mon, 4 May 2015 14:00:07 +0200
Subject: avoid context ambiguity


diff --git a/boost-include-intrin-h-on-mingw-w64.patch b/boost-include-intrin-h-on-mingw-w64.patch
index a04bd64..5c7ef88 100644
--- a/boost-include-intrin-h-on-mingw-w64.patch
+++ b/boost-include-intrin-h-on-mingw-w64.patch
@@ -7,8 +7,8 @@
 -#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
 +#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) || defined( __MINGW64_VERSION_MAJOR )
  
--#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1500
-+#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1500 ) || defined( __MINGW64_VERSION_MAJOR )
+-#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1400
++#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1400 ) || defined( __MINGW64_VERSION_MAJOR )
  
  #include <intrin.h>
  
diff --git a/boost-mingw.patch b/boost-mingw.patch
index 0058637..cc66d0d 100644
--- a/boost-mingw.patch
+++ b/boost-mingw.patch
@@ -40,10 +40,14 @@
      return $(tmp) ;
  }
  
-@@ -581,6 +583,17 @@
-    ;
- 
- alias asm_context_sources
+@@ -578,6 +580,18 @@
+      <address-model>32
+      <architecture>x86
+      <binary-format>pe
++     <toolset>msvc
++   ;
++
++alias asm_context_sources
 +   : asm/make_i386_ms_pe_gas.S
 +     asm/jump_i386_ms_pe_gas.S
 +     dummy.cpp
@@ -52,16 +56,17 @@
 +     <binary-format>pe
 +     <target-os>windows
 +     <toolset>gcc
-+   ;
-+
-+alias asm_context_sources
-    : asm/make_i386_ms_pe_masm.asm
-      asm/jump_i386_ms_pe_masm.asm
-      dummy.cpp
-@@ -715,6 +728,17 @@
     ;
  
  alias asm_context_sources
+@@ -712,6 +726,18 @@
+      <address-model>64
+      <architecture>x86
+      <binary-format>pe
++     <toolset>msvc
++   ;
++
++alias asm_context_sources
 +   : asm/make_x86_64_ms_pe_gas.S
 +     asm/jump_x86_64_ms_pe_gas.S
 +     dummy.cpp
@@ -70,12 +75,9 @@
 +     <binary-format>pe
 +     <target-os>windows
 +     <toolset>gcc
-+   ;
-+
-+alias asm_context_sources
-    : asm/make_x86_64_ms_pe_masm.asm
-      asm/jump_x86_64_ms_pe_masm.asm
-      dummy.cpp
+    ;
+ 
+ alias asm_context_sources
 --- libs/context/src/asm/make_i386_ms_pe_gas.S.orig	2013-03-03 13:41:28.645502113 +0100
 +++ libs/context/src/asm/make_i386_ms_pe_gas.S	2013-03-03 14:39:27.590477410 +0100
 @@ -0,0 +1,115 @@
diff --git a/mingw-boost.spec b/mingw-boost.spec
index 41e0329..67b6ade 100644
--- a/mingw-boost.spec
+++ b/mingw-boost.spec
@@ -183,8 +183,8 @@ cp -r win32 win64
 %build
 %if 0%{?mingw_build_win32} == 1
 pushd win32
-cat >> ./tools/build/v2/user-config.jam << EOF
-using gcc : : i686-w64-mingw32-g++ ;
+cat >> ./tools/build/src/user-config.jam << EOF
+using gcc : : i686-w64-mingw32-g++ : <rc>/usr/bin/i686-w64-mingw32-windres ;
 EOF
 
 ./bootstrap.sh --with-toolset=gcc --with-icu=%{mingw32_prefix}
@@ -198,8 +198,8 @@ popd
 %endif
 %if 0%{?mingw_build_win64} == 1
 pushd win64
-cat >> ./tools/build/v2/user-config.jam << EOF
-using gcc : : x86_64-w64-mingw32-g++ ;
+cat >> ./tools/build/src/user-config.jam << EOF
+using gcc : : x86_64-w64-mingw32-g++ : <rc>/usr/bin/x86_64-w64-mingw32-windres ;
 EOF
 
 ./bootstrap.sh --with-toolset=gcc --with-icu=%{mingw64_prefix}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-boost.git/commit/?h=f22&id=f1a4fefcbfc23cca96bf6a5d15a7bdc02af159a7