mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 23:14:37 +08:00
merge
This commit is contained in:
Chaoting Liu
commit
6a058431e4
@ -7,39 +7,22 @@
|
||||
|
||||
pkgbase=boost
|
||||
pkgname=('boost-libs' 'boost')
|
||||
pkgver=1.55.0
|
||||
pkgver=1.60.0
|
||||
_boostver=${pkgver//./_}
|
||||
pkgrel=3
|
||||
pkgrel=1
|
||||
pkgdesc="Free peer-reviewed portable C++ source libraries"
|
||||
arch=('x86_64')
|
||||
url="http://www.boost.org/"
|
||||
license=('custom')
|
||||
makedepends=('icu' 'python2' 'python3' 'bzip2' 'zlib' 'openmpi')
|
||||
source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz"
|
||||
# upstream patches
|
||||
log_fix_dump_avx2.patch
|
||||
gcc5.patch)
|
||||
md5sums=('93780777cfbf999a600f62883bd54b17'
|
||||
'2d8c2a83421afacda0ff0192c68b2c17'
|
||||
'39c9d2165dc2a3d9df50292a5509b270')
|
||||
#options=("!makeflags")
|
||||
source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz")
|
||||
sha1sums=('ac74db1324e6507a309c5b139aea41af624c8110')
|
||||
license=('custom')
|
||||
|
||||
_stagedir="${srcdir}/stagedir"
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgbase}_${_boostver}"
|
||||
|
||||
patch -Np0 < ${srcdir}/log_fix_dump_avx2.patch
|
||||
patch -Np1 < ${srcdir}/gcc5.patch
|
||||
|
||||
# Add an extra python version. This does not replace anything and python 2.x need to be the default.
|
||||
echo "using python : 3.4 : /usr/bin/python3 : /usr/include/python3.4m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> ./tools/build/v2/user-config.jam
|
||||
|
||||
./bootstrap.sh --with-toolset=gcc --with-icu
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -51,17 +34,16 @@ build() {
|
||||
|
||||
_bindir="bin.linuxx86_64"
|
||||
|
||||
install -d -m 755 "${_stagedir}"/bin
|
||||
install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2
|
||||
install -Dm755 tools/build/src/engine/${_bindir}/b2 "${_stagedir}"/bin/b2
|
||||
|
||||
# Add an extra python version. This does not replace anything and python 2.x
|
||||
# need to be the default.
|
||||
echo "using python : 3.5 : /usr/bin/python3 : /usr/include/python3.5m : /usr/lib ;" \
|
||||
>> project-config.jam
|
||||
|
||||
|
||||
pushd tools
|
||||
for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
|
||||
"${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool
|
||||
done
|
||||
"${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" library_status
|
||||
popd
|
||||
cp -a dist/bin/* "${_stagedir}"/bin
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> project-config.jam
|
||||
|
||||
# boostbook is needed by quickbook
|
||||
install -dm755 "${_stagedir}"/share/boostbook
|
||||
@ -121,4 +103,3 @@ package_boost-libs() {
|
||||
install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
|
||||
"${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
|
||||
}
|
||||
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From eec808554936ae068b23df07ab54d4dc6302a695 Mon Sep 17 00:00:00 2001
|
||||
From: jzmaddock <jzmaddock@gmail.com>
|
||||
Date: Sat, 23 Aug 2014 09:38:02 +0100
|
||||
Subject: [PATCH] Fix BOOST_NO_CXX11_VARIADIC_TEMPLATES definition - the
|
||||
feature was introduced in GCC 4.4.
|
||||
|
||||
---
|
||||
include/boost/config/compiler/gcc.hpp | 9 +--------
|
||||
1 file changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
Index: boost1.55-1.55.0+dfsg/boost/config/compiler/gcc.hpp
|
||||
===================================================================
|
||||
--- boost1.55-1.55.0+dfsg.orig/boost/config/compiler/gcc.hpp
|
||||
+++ boost1.55-1.55.0+dfsg/boost/config/compiler/gcc.hpp
|
||||
@@ -151,13 +151,6 @@
|
||||
# define BOOST_NO_CXX11_RVALUE_REFERENCES
|
||||
# define BOOST_NO_CXX11_STATIC_ASSERT
|
||||
|
||||
-// Variadic templates compiler:
|
||||
-// http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
|
||||
-# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
|
||||
-# define BOOST_HAS_VARIADIC_TMPL
|
||||
-# else
|
||||
-# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
-# endif
|
||||
#endif
|
||||
|
||||
// C++0x features in 4.4.n and later
|
||||
@@ -170,6 +163,7 @@
|
||||
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
|
||||
# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
|
||||
# define BOOST_NO_CXX11_DELETED_FUNCTIONS
|
||||
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||||
# define BOOST_NO_CXX11_TRAILING_RESULT_TYPES
|
||||
# define BOOST_NO_CXX11_INLINE_NAMESPACES
|
||||
#endif
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Index: libs/log/src/dump_avx2.cpp
|
||||
===================================================================
|
||||
--- libs/log/src/dump_avx2.cpp (revision 86614)
|
||||
+++ libs/log/src/dump_avx2.cpp (working copy)
|
||||
@@ -205,7 +205,7 @@
|
||||
__m256i mm_input = _mm256_load_si256(reinterpret_cast< const __m256i* >(p));
|
||||
__m256i mm_output1, mm_output2, mm_output3;
|
||||
dump_pack(mm_char_10_to_a, mm_input, mm_output1, mm_output2, mm_output3);
|
||||
- store_characters_x3(mm_output1, mm_output2, mm_output3, buf);
|
||||
+ store_characters_x3(mm_output1, mm_output2, mm_output3, b);
|
||||
}
|
||||
|
||||
_mm256_zeroall(); // need to zero all ymm registers to avoid register spills/restores the compler generates around the function call
|
||||
@ -3,7 +3,7 @@
|
||||
# maintainer abveritas[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=icu
|
||||
pkgver=55.1
|
||||
pkgver=56.1
|
||||
pkgrel=1
|
||||
pkgdesc="International Components for Unicode library"
|
||||
arch=('x86_64')
|
||||
@ -40,3 +40,5 @@ package() {
|
||||
# Install license
|
||||
install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html
|
||||
}
|
||||
md5sums=('c4a2d71ff56aec5ebfab2a3f059be99d'
|
||||
'ebd5470fc969c75e52baf4af94a9ee82')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user