Commit 277db5d6 authored by Frederick Zhang's avatar Frederick Zhang
Browse files

boost

parent 60518406
......@@ -131,6 +131,23 @@ RUN cmake .. -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=x86_64-w64-mingw32-g
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DDLLTOOL=/usr/bin/x86_64-w64-mingw32-dlltool -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32
RUN make && make install
# BOOST
WORKDIR /builds
RUN curl -O -J -L https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz/download
RUN tar xf boost_1_63_0.tar.gz
WORKDIR /builds/boost_1_63_0
RUN patch -Np0 -i /apps/patches/boost/boost-mingw.patch
WORKDIR /builds/boost_1_63_0/libs/serialization
RUN patch -p1 -i /apps/patches/boost/42.patch
WORKDIR /builds/boost_1_63_0
RUN cp /apps/patches/boost/user-config.jam ./
RUN ./bootstrap.sh --with-toolset=gcc --with-python=/usr/bin/python2
RUN ./b2 -d+2 -q target-os=windows variant=release threading=multi threadapi=win32 link=shared,static \
runtime-link=shared --prefix=/usr/x86_64-w64-mingw32 --user-config=user-config.jam --without-python \
--without-mpi --without-graph_parallel \
cxxflags="-std=c++11 -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" \
address-model=64 architecture=x86 binary-format=pe --layout=tagged install
# CURL
# to be improved
WORKDIR /builds
......
From aab8477eb1456896bf7311e913fb9b20b5f5e335 Mon Sep 17 00:00:00 2001
From: xantares <[email protected]>
Date: Sat, 14 May 2016 16:16:51 +0200
Subject: [PATCH] Fix undefined reference to codecvt_null<wchar_t>
See https://svn.boost.org/trac/boost/ticket/12205
---
build/Jamfile.v2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 8fd92e6..cb17dd5 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -80,7 +80,6 @@ SOURCES =
xml_iarchive
xml_oarchive
xml_archive_exception
- codecvt_null
utf8_codecvt_facet
singleton
;
@@ -93,6 +92,7 @@ WSOURCES =
xml_wgrammar
xml_wiarchive
xml_woarchive
+ codecvt_null
;
lib boost_serialization
--- libs/thread/build/Jamfile.v2.mingw 2012-12-04 15:05:00.027057650 +0100
+++ libs/thread/build/Jamfile.v2 2012-12-04 15:05:22.488292220 +0100
@@ -101,7 +101,8 @@
local rule default_threadapi ( )
{
local api = pthread ;
- if [ os.name ] = "NT" { api = win32 ; }
+ #if [ os.name ] = "NT" { api = win32 ; }
+ api = win32 ;
return $(api) ;
}
--- libs/context/build/Jamfile.v2.orig 2013-03-03 13:39:59.684868916 +0100
+++ libs/context/build/Jamfile.v2 2013-03-03 15:09:09.893232829 +0100
@@ -45,10 +45,11 @@
local rule default_binary_format ( )
{
local tmp = elf ;
- if [ os.name ] = "NT" { tmp = pe ; }
- else if [ os.name ] = "CYGWIN" { tmp = pe ; }
- else if [ os.name ] = "AIX" { tmp = xcoff ; }
- else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+ #if [ os.name ] = "NT" { tmp = pe ; }
+ #else if [ os.name ] = "CYGWIN" { tmp = pe ; }
+ #else if [ os.name ] = "AIX" { tmp = xcoff ; }
+ #else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+ tmp = pe ;
return $(tmp) ;
}
@@ -65,10 +66,11 @@
local rule default_abi ( )
{
local tmp = sysv ;
- if [ os.name ] = "NT" { tmp = ms ; }
- else if [ os.name ] = "CYGWIN" { tmp = ms ; }
- else if [ os.platform ] = "ARM" { tmp = aapcs ; }
- else if [ os.platform ] = "MIPS" { tmp = o32 ; }
+ #if [ os.name ] = "NT" { tmp = ms ; }
+ #else if [ os.name ] = "CYGWIN" { tmp = ms ; }
+ #else if [ os.platform ] = "ARM" { tmp = aapcs ; }
+ #else if [ os.platform ] = "MIPS" { tmp = o32 ; }
+ tmp = ms ;
return $(tmp) ;
}
using gcc : mingw64 : x86_64-w64-mingw32-g++
:
<rc>x86_64-w64-mingw32-windres
<archiver>x86_64-w64-mingw32-ar
;
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