Skip to content

Commit af09283

Browse files
committed
Updating iOS script to use a patch file and fix the version of Boost to 1.56.
1 parent b96fdeb commit af09283

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

Build_iOS/configure.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ set -e
33

44
git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
55
pushd boostoniphone
6-
sed -e 's/\${IPHONE_SDKVERSION:=7.0}/\${IPHONE_SDKVERSION:=8.0}/' -i .bak boost.sh
7-
sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system date_time"}/g' -i .bak boost.sh
6+
git apply ../fix_boost_version.patch
87
./boost.sh
98
pushd ios/framework/boost.framework/Versions/A
109
mkdir Headers2

Build_iOS/fix_boost_version.patch

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From e5b3bf1392d3dc04f1391c4ad60118a394b5219f Mon Sep 17 00:00:00 2001
2+
From: Steve Gates <[email protected]>
3+
Date: Thu, 30 Oct 2014 17:42:43 -0700
4+
Subject: [PATCH] Fixing boost.sh to use Boost version 1.56 and iOS 8.0.
5+
6+
---
7+
boost.sh | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
10+
diff --git a/boost.sh b/boost.sh
11+
index 8847aac..2a76aec 100755
12+
--- a/boost.sh
13+
+++ b/boost.sh
14+
@@ -18,8 +18,8 @@
15+
# same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
16+
#===============================================================================
17+
18+
-: ${BOOST_LIBS:="filesystem date_time system"}
19+
-: ${IPHONE_SDKVERSION:=7.0}
20+
+: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
21+
+: ${IPHONE_SDKVERSION:=8.0}
22+
: ${OSX_SDKVERSION:=10.9}
23+
: ${XCODE_ROOT:=`xcode-select -print-path`}
24+
: ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
25+
@@ -84,7 +84,7 @@ updateBoost()
26+
then
27+
git checkout $BOOST_SRC/tools/build/v2/user-config.jam
28+
else
29+
- git clone --recursive https://github.com/boostorg/boost.git $BOOST_SRC
30+
+ git clone --recursive --branch boost-1.56.0 https://github.com/boostorg/boost.git $BOOST_SRC
31+
pushd $BOOST_SRC
32+
./bootstrap.sh
33+
./b2 headers
34+
--
35+
1.9.3 (Apple Git-50)
36+

0 commit comments

Comments
 (0)