Merge remote-tracking branch 'madadam/master'

Conflicts: patches/boost-1_45_0/project-config.jam.patch patches/user-config.jam.patch
OSVR · Jun 18, 2012 · c5f7db9 · c5f7db9
2 parents 20abe05 + e01ffdf
commit c5f7db9
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ build
 *~
 logs
 build.log
+*.swp
+*.vim
diff --git a/build-android.sh b/build-android.sh
@@ -49,15 +49,11 @@ if [ -d "$BOOST_DIR" -o -d "build" -o -d "logs" -o -f "build.log" ]; then
 fi
 
 CLEAN=no
-register_option "--clean"          do_clean     "Perform a clean build deleting all previus build files."
-
-do_clean ()
-{
-	CLEAN=yes
-}
+register_option "--clean"    do_clean     "Perform a clean build deleting all previus build files."
+do_clean () {	CLEAN=yes; }
 
 DOWNLOAD=no
-register_option "--download"       do_download  "Only download required files and clean up previus build. No build will be performed."
+register_option "--download" do_download  "Only download required files and clean up previus build. No build will be performed."
 
 do_download ()
 {
@@ -66,6 +62,16 @@ do_download ()
 	CLEAN=yes
 }
 
+LIBRARIES=--with-libraries=date_time,filesystem,program_options,regex,signals,system,thread,iostreams
+
+register_option "--with-libraries=<list>" do_with_libraries "Comma separated list of libraries to build."
+do_with_libraries () { LIBRARIES="--with-libraries=$1"; }
+
+register_option "--without-libraries=<list>" do_without_libraries "Comma separated list of libraries to exclude from the build."
+do_without_libraries () {	LIBRARIES="--without-libraries=$1"; }
+
+
+
 PROGRAM_PARAMETERS="<ndk-root>"
 PROGRAM_DESCRIPTION=\
 "       Boost For Android\n"\
@@ -212,10 +218,13 @@ fi
 if [ ! -f ./$BOOST_DIR/bjam ]
 then
 	# Make the initial bootstrap
-	echo "Performing boost boostrap"
+	echo "Performing boost bootstrap"
 
 	cd $BOOST_DIR 
-	./bootstrap.sh 2>&1 | tee -a $PROGDIR/build.log
+	./bootstrap.sh --prefix="./../$BUILD_DIR/" 			\
+								 $LIBRARIES 											\
+								 2>&1 | tee -a $PROGDIR/build.log
+
 	if [ $? != 0 ] ; then
 		dump "ERROR: Could not perform boostrap! See $TMPLOG for more info."
 		exit 1

diff --git a/patches/boost-1_45_0/ndk-androidR4/user-config.jam.patch b/patches/boost-1_45_0/ndk-androidR4/user-config.jam.patch
@@ -1,6 +1,6 @@
 --- boost_1_45_0-old/tools/build/v2/user-config.jam	2008-07-15 16:53:41.000000000 +0300
 +++ boost_1_45_0/tools/build/v2/user-config.jam	2011-06-08 17:38:13.677497695 +0300
-@@ -84,3 +84,49 @@
+@@ -84,3 +84,46 @@
 
  # Configure with an explicit installation prefix.
  # using qt : /usr/opt/qt ;
@@ -43,10 +43,7 @@
 +<compileflags>-fvisibility=hidden
 +<compileflags>-fvisibility-inlines-hidden
 +<compileflags>-fdata-sections
-+<cxxflags>-DBOOST_THREAD_LINUX
-+<cxxflags>-DBOOST_HAS_PTHREADS
 +<cxxflags>-D__arm__
 +<cxxflags>-D_REENTRANT
 +<cxxflags>-D_GLIBCXX__PTHREADS
-+<cxxflags>-DBOOST_HAS_GETTIMEOFDAY
 +;
diff --git a/patches/boost-1_45_0/ndk-androidR5/user-config.jam.patch b/patches/boost-1_45_0/ndk-androidR5/user-config.jam.patch
@@ -1,6 +1,6 @@
 --- boost_1_45_0-old/tools/build/v2/user-config.jam	2008-07-15 16:53:41.000000000 +0300
 +++ boost_1_45_0/tools/build/v2/user-config.jam	2011-06-08 17:38:13.677497695 +0300
-@@ -84,3 +84,54 @@
+@@ -84,3 +84,51 @@
 
  # Configure with an explicit installation prefix.
  # using qt : /usr/opt/qt ;
@@ -48,10 +48,7 @@
 +<compileflags>-fvisibility=hidden
 +<compileflags>-fvisibility-inlines-hidden
 +<compileflags>-fdata-sections
-+<cxxflags>-DBOOST_THREAD_LINUX
-+<cxxflags>-DBOOST_HAS_PTHREADS
 +<cxxflags>-D__arm__
 +<cxxflags>-D_REENTRANT
 +<cxxflags>-D_GLIBCXX__PTHREADS
-+<cxxflags>-DBOOST_HAS_GETTIMEOFDAY
 +;
diff --git a/patches/boost-1_45_0/ndk-androidR8/user-config.jam.patch b/patches/boost-1_45_0/ndk-androidR8/user-config.jam.patch
@@ -1,6 +1,6 @@
 --- boost_1_45_0-old/tools/build/v2/user-config.jam	2008-07-15 16:53:41.000000000 +0300
 +++ boost_1_45_0/tools/build/v2/user-config.jam	2011-06-08 17:38:13.677497695 +0300
-@@ -84,3 +84,53 @@
+@@ -84,3 +84,50 @@
 
  # Configure with an explicit installation prefix.
  # using qt : /usr/opt/qt ;
@@ -47,10 +47,7 @@
 +<compileflags>-fvisibility=hidden
 +<compileflags>-fvisibility-inlines-hidden
 +<compileflags>-fdata-sections
-+<cxxflags>-DBOOST_THREAD_LINUX
-+<cxxflags>-DBOOST_HAS_PTHREADS
 +<cxxflags>-D__arm__
 +<cxxflags>-D_REENTRANT
 +<cxxflags>-D_GLIBCXX__PTHREADS
-+<cxxflags>-DBOOST_HAS_GETTIMEOFDAY
 +;
diff --git a/patches/boost-1_45_0/project-config.jam.patch b/patches/boost-1_45_0/project-config.jam.patch
diff --git a/patches/boost-1_48_0/boost-1_48_0.patch b/patches/boost-1_48_0/boost-1_48_0.patch
@@ -218,31 +218,6 @@ diff -ruN boost_1_48_0-boot/libs/filesystem/v3/src/operations.cpp boost_1_48_0-p
 
  #   define BOOST_ERROR_NOT_SUPPORTED ENOSYS
  #   define BOOST_ERROR_ALREADY_EXISTS EEXIST
-diff -ruN boost_1_48_0-boot/project-config.jam boost_1_48_0-patched/project-config.jam
---- boost_1_48_0-boot/project-config.jam	2012-06-17 00:11:38.000000000 +0200
-+++ boost_1_48_0-patched/project-config.jam	2012-06-17 00:21:03.000000000 +0200
-@@ -24,14 +24,16 @@
- # options. If left empty, all libraries will be built.
- # Options specified on the command line completely
- # override this variable.
--libraries =  ;
-+# @Moss - Adding needed libs to be valid for android
-+libraries = --with-date_time --with-filesystem --with-program_options --with-regex --with-signals --with-system --with-thread --with-iostreams ; 
-+
-
- # These settings are equivivalent to corresponding command-line
- # options.
--option.set prefix : /usr/local ;
--option.set exec-prefix : /usr/local ;
--option.set libdir : /usr/local/lib ;
--option.set includedir : /usr/local/include ;
-+option.set prefix : ./../build/ ;
-+option.set exec-prefix : ./../build/ ;
-+option.set libdir : ./../build//lib ;
-+option.set includedir : ./../build//include ;
-
- # Stop on first error
- option.set keep-going : false ;
 diff -ruN boost_1_48_0-boot/tools/build/v2/tools/android.jam boost_1_48_0-patched/tools/build/v2/tools/android.jam
 --- boost_1_48_0-boot/tools/build/v2/tools/android.jam	1970-01-01 01:00:00.000000000 +0100
 +++ boost_1_48_0-patched/tools/build/v2/tools/android.jam	2012-06-17 00:16:04.000000000 +0200

diff --git a/patches/boost-1_48_0/ndk-androidR7/user-config.jam.patch b/patches/boost-1_48_0/ndk-androidR7/user-config.jam.patch
@@ -1,6 +1,6 @@
 --- boost_1_45_0-old/tools/build/v2/user-config.jam	2012-06-18 02:11:11.000000000 +0200
 +++ boost_1_45_0/tools/build/v2/user-config.jam	2012-06-18 02:11:38.000000000 +0200
-@@ -74,6 +74,57 @@
+@@ -74,6 +74,54 @@
  # using stlport : : /usr/include/stlport /usr/lib ;
 
 
@@ -47,12 +47,9 @@
 +<compileflags>-fvisibility=hidden
 +<compileflags>-fvisibility-inlines-hidden
 +<compileflags>-fdata-sections
-+<cxxflags>-DBOOST_THREAD_LINUX
-+<cxxflags>-DBOOST_HAS_PTHREADS
 +<cxxflags>-D__arm__
 +<cxxflags>-D_REENTRANT
 +<cxxflags>-D_GLIBCXX__PTHREADS
-+<cxxflags>-DBOOST_HAS_GETTIMEOFDAY
 +;
 +
  # -----------------

diff --git a/patches/boost-1_48_0/ndk-androidR8/user-config.jam.patch b/patches/boost-1_48_0/ndk-androidR8/user-config.jam.patch
@@ -1,6 +1,6 @@
 --- boost_1_45_0-old/tools/build/v2/user-config.jam	2012-06-18 02:00:37.000000000 +0200
 +++ boost_1_45_0/tools/build/v2/user-config.jam	2012-06-18 02:05:15.000000000 +0200
-@@ -74,6 +74,56 @@
+@@ -74,6 +74,53 @@
  # using stlport : : /usr/include/stlport /usr/lib ;
 
 
@@ -46,12 +46,9 @@
 +<compileflags>-fvisibility=hidden
 +<compileflags>-fvisibility-inlines-hidden
 +<compileflags>-fdata-sections
-+<cxxflags>-DBOOST_THREAD_LINUX
-+<cxxflags>-DBOOST_HAS_PTHREADS
 +<cxxflags>-D__arm__
 +<cxxflags>-D_REENTRANT
 +<cxxflags>-D_GLIBCXX__PTHREADS
-+<cxxflags>-DBOOST_HAS_GETTIMEOFDAY
 +;
 +
  # -----------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ build @@
     *~
     logs
     build.log
+    *.swp
+    *.vim