Commit 76f3ee4c authored by abveritas's avatar abveritas

seperated boost and boost-libs

parent 03ed075b
...@@ -13,9 +13,10 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf ...@@ -13,9 +13,10 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# Platform: akonadi (exempi uses boost just as makedep) # Platform: akonadi (exempi uses boost just as makedep)
# Desktop: kdeedu (kdenetwork, kdepimlibs, kdepim, kdesdk and koffice using boost just as makedep) # Desktop: kdeedu (kdenetwork, kdepimlibs, kdepim, kdesdk and koffice using boost just as makedep)
pkgname=boost pkgbase=boost
pkgname=('boost-libs' 'boost')
pkgver=1.46.1 pkgver=1.46.1
_boostver=1_46_1 _boostver=${pkgver//./_}
pkgrel=1 pkgrel=1
pkgdesc="Free peer-reviewed portable C++ source libraries" pkgdesc="Free peer-reviewed portable C++ source libraries"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
...@@ -25,43 +26,50 @@ depends=('bzip2' 'zlib') ...@@ -25,43 +26,50 @@ depends=('bzip2' 'zlib')
makedepends=('icu' 'python2' 'bzip2' 'zlib') # Add Python (3) whenever it is added to our repos. makedepends=('icu' 'python2' 'bzip2' 'zlib') # Add Python (3) whenever it is added to our repos.
optdepends=('python: for python bindings') optdepends=('python: for python bindings')
options=('!ccache') options=('!ccache')
source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$_boostver.tar.gz) source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
md5sums=('341e5d993b19d099bf1a548495ea91ec') boost-1.46.0-spirit.patch)
md5sums=('341e5d993b19d099bf1a548495ea91ec'
'9d6e2f13fef23bf27d7bdddc104e182a')
build() { _stagedir="${srcdir}/stagedir"
# Set Python path for Bjam. build() {
cd $srcdir/${pkgname}_$_boostver/tools # set python path for bjam
cd "${srcdir}/${pkgbase}_${_boostver}/tools"
echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
#echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
#echo "using mpi ;" >> build/v2/user-config.jam
# Build Bjam. # build bjam
cd $srcdir/${pkgname}_$_boostver/tools/build/v2/engine/src cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src"
./build.sh cc ./build.sh cc
_bindir="bin.linuxx86" _bindir="bin.linuxx86"
[ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
install -d $pkgdir/usr/bin install -d "${_stagedir}"/usr/bin
install $_bindir/bjam $pkgdir/usr/bin/bjam install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
# Build tools. # build tools
cd $srcdir/${pkgbase}_$_boostver/tools/ cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
$pkgdir/usr/bin/bjam --toolset=gcc "${_stagedir}"/usr/bin/bjam --toolset=gcc
# Copy the tools. # copy the tools
cd $srcdir/${pkgbase}_$_boostver/dist/bin cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
for i in * for i in *;do
do install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
install -m755 "${i}" "$pkgdir/usr/bin/${i}"
done done
# Boostbook needed by quickbook. #boostbook needed by quickbook
cd $srcdir/${pkgbase}_$_boostver/dist/ cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
cp -r share $pkgdir cp -r share "${_stagedir}"
# Build libs. # build libs
cd $srcdir/${pkgname}_$_boostver cd "${srcdir}/${pkgbase}_${_boostver}"
#https://svn.boost.org/trac/boost/ticket/4994
patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
# default "minimal" install: "release link=shared,static # default "minimal" install: "release link=shared,static
# runtime-link=shared threading=single,multi" # runtime-link=shared threading=single,multi"
# --layout=tagged will add the "-mt" suffix for multithreaded libraries # --layout=tagged will add the "-mt" suffix for multithreaded libraries
...@@ -69,19 +77,58 @@ build() { ...@@ -69,19 +77,58 @@ build() {
# --layout=system no longer adds the -mt suffix for multi-threaded libs. # --layout=system no longer adds the -mt suffix for multi-threaded libs.
# install to ${_stagedir} in preparation for split packaging # install to ${_stagedir} in preparation for split packaging
$pkgdir/usr/bin/bjam \ "${_stagedir}"/usr/bin/bjam \
release debug-symbols=off threading=multi \ release debug-symbols=off threading=multi \
runtime-link=shared link=shared,static \ runtime-link=shared link=shared,static \
cflags=-fno-strict-aliasing \ cflags=-fno-strict-aliasing \
toolset=gcc \ toolset=gcc \
--prefix=$pkgdir \ --prefix="${_stagedir}" \
-sTOOLS=gcc \ -sTOOLS=gcc \
--without-mpi
--layout=system \ --layout=system \
$MAKEFLAGS \ ${MAKEFLAGS} \
install install
# License. # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html
install -d $pkgdir/usr/share/licenses/$pkgname # build pyste
install -m644 $srcdir/${pkgname}_$_boostver/LICENSE_1_0.txt \ #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
$pkgdir/usr/share/licenses/$pkgname/ #python2 setup.py install --root=${_stagedir} --optimize=1
}
package_boost() {
pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
depends=("boost-libs=${pkgver}")
optdepends=('python: for python bindings'
'python2: for python2 bindings')
install -d "${pkgdir}"/usr/{include,lib,share}
# headers/source files
cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
# static libs
cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
# utilities (bjam, bcp, pyste)
cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
#boostbook
cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
# license
install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
"${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
}
package_boost-libs() {
pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
optdepends=('openmpi: for mpi support')
install -d "${pkgdir}/usr/lib"
#shared libs
cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
# license
install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
"${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
} }
Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
===================================================================
--- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724)
+++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725)
@@ -14,6 +14,7 @@
#include <boost/ref.hpp>
+#include <boost/spirit/home/support/handles_container.hpp>
#include <boost/spirit/home/qi/parser.hpp>
namespace boost { namespace spirit { namespace qi
@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
};
}}}
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Subject, typename Params, typename Attribute
+ , typename Context, typename Iterator>
+ struct handles_container<qi::parameterized_nonterminal<Subject, Params>
+ , Attribute, Context, Iterator>
+ : handles_container<typename remove_const<Subject>::type
+ , Attribute, Context, Iterator>
+ {};
+}}}
+
#endif
Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
===================================================================
--- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724)
+++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725)
@@ -14,6 +14,7 @@
#include <boost/ref.hpp>
+#include <boost/spirit/home/support/handles_container.hpp>
#include <boost/spirit/home/karma/generator.hpp>
namespace boost { namespace spirit { namespace karma
@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
};
}}}
+
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Subject, typename Params, typename Attribute
+ , typename Context, typename Iterator>
+ struct handles_container<karma::parameterized_nonterminal<Subject, Params>
+ , Attribute, Context, Iterator>
+ : handles_container<typename remove_const<Subject>::type
+ , Attribute, Context, Iterator>
+ {};
+}}}
+
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment