Enable builds on OSX

Remove hardcoded platform strings with variables and fix scripts
to work on both OSX and Linux.

Author: denizt

Build_android/boost-for-android-x86.patch

@@ -20,8 +20,15 @@ index 40453f7..7ffc050 100755
                  ;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -404,8 +409,8 @@ echo "Building boost for android"
-          threading=multi              \
+@@ -391,6 +396,7 @@ echo "Building boost for android"
+   export AndroidBinariesPath=`dirname $CXXPATH`
+   export PATH=$AndroidBinariesPath:$PATH
+   export AndroidNDKRoot
++  export PlatformOS
+   export NO_BZIP2=1
+
+   cxxflags=""
+@@ -405,7 +411,7 @@ echo "Building boost for android"
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
           $LIBRARIES                   \
@@ -31,22 +38,25 @@ index 40453f7..7ffc050 100755
    } | tee -a $PROGDIR/build.log
 
 diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
-index 666d4c8..762753e 100644
+index 666d4c8..4cd3441 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
-@@ -41,91 +41,44 @@ import os ;
+@@ -39,93 +39,47 @@
+
+ import os ;
  local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
++local PlatformOS = [ os.environ PlatformOS ] ;
 
  # --------------------------------------------------------------------
 -# Is same for 8b, 8c and 8d
 -using gcc : androidR8b
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
-+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/linux-x86_64"
++<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
  <compileflags>-fexceptions
  <compileflags>-frtti
  <compileflags>-fpic
@@ -82,7 +92,7 @@ index 666d4c8..762753e 100644
 +<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
 +<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include
 +<linkflags>--target=i686-none-linux-android
-+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/linux-x86_64"
++<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/$(PlatformOS)-x86_64"
 +<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-x86
  # @Moss - Above are the 'oficial' android flags
 -<architecture>arm

Build_android/boost-for-android.patch

@@ -20,7 +20,15 @@ index 40453f7..ad78ddf 100755
                  ;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -404,8 +409,8 @@ echo "Building boost for android"
+@@ -391,6 +396,7 @@ echo "Building boost for android"
+   export AndroidBinariesPath=`dirname $CXXPATH`
+   export PATH=$AndroidBinariesPath:$PATH
+   export AndroidNDKRoot
++  export PlatformOS
+   export NO_BZIP2=1
+
+   cxxflags=""
+@@ -405,7 +411,7 @@ echo "Building boost for android"
           threading=multi              \
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
@@ -34,19 +42,22 @@ diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_
 index 666d4c8..df597f6 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
-@@ -41,82 +41,41 @@ import os ;
+@@ -39,84 +39,44 @@
+
+ import os ;
  local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ;
- 
++local PlatformOS = [ os.environ PlatformOS ] ;
+
  # --------------------------------------------------------------------
 -# Is same for 8b, 8c and 8d
 -using gcc : androidR8b
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/$(PlatformOS)-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
-+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64"
++<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
  <compileflags>-fexceptions
  <compileflags>-frtti
  <compileflags>-fpic
@@ -126,7 +137,7 @@ index 666d4c8..df597f6 100644
 +<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include
 +<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include
 +<linkflags>--target=armv7-none-linux-androideabi
-+<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64"
++<linkflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/$(PlatformOS)-x86_64"
 +<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm
  # @Moss - Above are the 'oficial' android flags
  <architecture>arm

Build_android/openssl/Makefile

@@ -16,8 +16,8 @@ setenv-android.sh:
 
 setenv-android-x86.sh: setenv-android.sh
 	cp setenv-android.sh setenv-android-x86.sh.tmp
-	sed -i 's/_ANDROID_EABI="arm-linux-androideabi-4.8"/_ANDROID_EABI="x86-4.8"/g' setenv-android-x86.sh.tmp
-	sed -i 's/_ANDROID_ARCH=arch-arm/_ANDROID_ARCH=arch-x86/g' setenv-android-x86.sh.tmp
+	sed -i -e 's/_ANDROID_EABI="arm-linux-androideabi-4.8"/_ANDROID_EABI="x86-4.8"/g' setenv-android-x86.sh.tmp
+	sed -i -e 's/_ANDROID_ARCH=arch-arm/_ANDROID_ARCH=arch-x86/g' setenv-android-x86.sh.tmp
 	mv setenv-android-x86.sh.tmp setenv-android-x86.sh
 
 $(OPENSSL_VER).tar.gz: