pool/boost
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 230967 from home:Andreas_Schwab:Factory

Browse Source 
- Fix quoting while creating shared build instructions
- Properly configure library list
- bjam-alignment.patch: fix alignment check in bjam

OBS-URL: https://build.opensuse.org/request/show/230967
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=128
This commit is contained in:
Dirk Mueller 2014-04-25 10:12:15 +00:00 committed by Git OBS Bridge
parent 45646a3155
commit 159a577cd3
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bjam-alignment.patch Normal file
View File

@ -0,0 +1,13 @@
Index: boost_1_54_0/tools/build/v2/engine/function.c
===================================================================
--- boost_1_54_0.orig/tools/build/v2/engine/function.c
+++ boost_1_54_0/tools/build/v2/engine/function.c
@@ -230,7 +230,7 @@ STACK * stack_global()
static void check_alignment( STACK * s )
{
- assert( (size_t)s->data % sizeof( LIST * ) == 0 );
+ assert( (size_t)s->data % __alignof__( LIST * ) == 0 );
}
void * stack_allocate( STACK * s, int size )

7
boost.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Apr 19 17:40:27 UTC 2014 - schwab@suse.de
- Fix quoting while creating shared build instructions
- Properly configure library list
- bjam-alignment.patch: fix alignment check in bjam
-------------------------------------------------------------------
Tue Apr 1 08:20:21 UTC 2014 - coolo@suse.com

14
boost.spec
View File

@ -109,6 +109,7 @@ Patch9: boost-pool_check_overflow.patch
Patch20: boost-strict_aliasing.patch
Patch50: boost-use_std_xml_catalog.patch
Patch60: boost-glibc-2.18.patch
Patch61: bjam-alignment.patch
#PATCH-FIX-UPSTREAM A post-release patch.
Patch71: boost-1.54-001-coroutine.patch
#PATCH-FIX-UPSTREAM A post-release patch.
@ -430,6 +431,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch20
%patch50
%patch60 -p1
%patch61 -p1
%patch71 -p1
%patch72 -p1
%patch73 -p1
@ -442,7 +444,7 @@ find . -name \*.orig -exec rm {} +
find . -type f -exec chmod u+w {} +
# Create shared build instructions
cat << EOF >.build
cat << \EOF >.build
# Now build it
J_P=%{jobs}
J_G=$(getconf _NPROCESSORS_ONLN)
@ -476,10 +478,10 @@ PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION"
export REGEX_FLAGS="--with-icu"
export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir}
export PYTHON_FLAGS
LIBRARIES_FLAGS=
LIBRARIES_FLAGS=--with-libraries=all
%if !%build_context
# coroutine depends on context
LIBRARIES_FLAGS+=" --without-context --without-coroutine"
LIBRARIES_FLAGS+=" --without-libraries=context,coroutine"
%endif
EOF
@ -487,11 +489,11 @@ EOF
. ./.build
# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
. /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
# use supplied bootstrap.sh instead of mucking with old bjam
# see also: https://svn.boost.org/trac/boost/ticket/9304
./bootstrap.sh --with-libraries=all \
./bootstrap.sh $LIBRARIES_FLAGS \
--prefix=%{_prefix} --exec-prefix=%{_bindir} \
--libdir=%{_libdir} --includedir=%{_includedir}
@ -526,7 +528,7 @@ cd doc
. ./.build
# Set PATH, MANPATH and LD_LIBRARY_PATH for mpi
source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
. /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh
./b2 install \
--prefix=%{buildroot}%{_prefix} --exec-prefix=%{buildroot}%{_bindir} \