Accepting request 308225 from home:Andreas_Schwab:Factory

- boost-unrecognized-option.patch: remove unrecognized option -m32

OBS-URL: https://build.opensuse.org/request/show/308225
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=146
This commit is contained in:
Dirk Mueller 2015-05-26 07:57:23 +00:00 committed by Git OBS Bridge
parent 540c5bdf5e
commit 2de401cbff
3 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,15 @@
Index: boost_1_58_0/tools/build/src/tools/gcc.jam
===================================================================
--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam
+++ boost_1_58_0/tools/build/src/tools/gcc.jam
@@ -453,10 +453,6 @@ rule setup-address-model ( targets * : s
local arch = [ feature.get-values architecture : $(properties) ] ;
if $(arch) != arm
{
- if $(model) = 32
- {
- option = -m32 ;
- }
}
# For darwin, the model can be 32_64. darwin.jam will handle that
# on its own.

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 21 13:04:18 UTC 2015 - schwab@suse.de
- boost-unrecognized-option.patch: remove unrecognized option -m32
-------------------------------------------------------------------
Sat May 9 09:01:32 UTC 2015 - dmueller@suse.com

View File

@ -96,6 +96,7 @@ Patch10: 0002-Fix-a-regression-with-non-constexpr-types.patch
Patch11: boost-aarch64-flags.patch
Patch12: boost-uuid-comparison.patch
Patch13: boost-disable-pch-on-aarch64.patch
Patch14: boost-unrecognized-option.patch
BuildRequires: chrpath
BuildRequires: dos2unix
BuildRequires: fdupes
@ -433,9 +434,8 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch10 -p1
%patch11 -p1
%patch12 -p1
%ifarch aarch64
%patch13 -p1
%endif
%patch14 -p1
#stupid build machinery copies .orig files
find . -name \*.orig -exec rm {} +