Changed OSX linking to static

freelan-developers · Nov 9, 2013 · 77dc928 · 77dc928
1 parent 55db967
commit 77dc928
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 30 deletions.
diff --git a/freelan b/freelan
diff --git a/libfreelan b/libfreelan
diff --git a/party.yaml b/party.yaml
@@ -25,11 +25,21 @@ attendees:
           - 'copy ReleaseStatic_x64\libiconvStatic.lib {{prefix}}\lib\libiconv.lib'
           - 'xcopy include\* {{prefix}}\include\ /S /Y'
   boost:
-    filters: msvc
     source:
-      location: http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.zip/download
-      type: application/zip
+      -
+        location: http://sourceforge.net/projects/boost/files/boost/1.49.0/boost_1_49_0.tar.bz2/download
+        type: application/x-bzip2
+        filters: darwin
+      -
+        location: http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.zip/download
+        type: application/zip
+        filters: windows
     builders:
+      osx:
+        filters: darwin
+        commands:
+          - './bootstrap.sh'
+          - './b2 --prefix={{prefix}} --layout=system --without-serialization variant=release link=static threading=multi runtime-link=shared address-model=64 install'
       msvc-x86:
         tags: x86
         filters: msvc-x86
@@ -45,9 +55,14 @@ attendees:
           - 'bootstrap.bat'
           - 'b2 --prefix={{prefix}} --layout=system --without-serialization toolset=msvc variant=release link=static threading=multi runtime-link=shared address-model=64 install'
   openssl:
-    filters: msvc
     source: http://www.openssl.org/source/openssl-1.0.1e.tar.gz
     builders:
+      osx:
+        filters: darwin
+        commands:
+          - './Configure no-shared no-asm --prefix={{prefix}} darwin64-x86_64-cc '
+          - 'make'
+          - 'make install'
       msvc-x86:
         tags: x86
         filters: msvc-x86
@@ -69,9 +84,20 @@ attendees:
   curl:
     depends:
       - openssl
-    filters: msvc
-    source: http://curl.haxx.se/download/curl-7.32.0.zip
+    source:
+      -
+        location: http://curl.haxx.se/download/curl-7.32.0.zip
+        filters: windows
+      -
+        location: http://curl.haxx.se/download/curl-7.33.0.tar.bz2
+        filters: darwin
     builders:
+      osx:
+        filters: darwin
+        commands:
+          - 'sh configure --enable-static -disable-shared --without-darwinssl --with-ssl={{prefix}} --prefix={{prefix}}'
+          - 'make'
+          - 'make install'
       msvc-x86:
         tags: x86
         filters: msvc-x86
@@ -92,4 +118,4 @@ attendees:
 # Path settings
 build_path: third-party/build
 cache_path: third-party/cache
-prefix: third-party/install
+prefix: third-party/install
diff --git a/tools/osx/setup-environment.sh b/tools/osx/setup-environment.sh
@@ -14,6 +14,9 @@ export FREELAN_BUILD_ROOT="${FREELAN_ALL_ROOT}/build"
 # INSTALL_ROOT is a directory which contains include, lib and bin sub-directories.
 export FREELAN_INSTALL_ROOT="${FREELAN_ALL_ROOT}/install"
 
+# THIRD_PARTY_ROOT contains the compiled third-party libraries.
+export FREELAN_THIRD_PARTY_ROOT="${FREELAN_ALL_ROOT}/third-party/install"
+
 # Create the subdirectories
 for SUBDIR in include lib etc bin; do
 	mkdir -p ${FREELAN_BUILD_ROOT}/${SUBDIR}
@@ -33,23 +36,12 @@ export LIBRARY_PATH="${FREELAN_INSTALL_PREFIX}/lib:${LIBRARY_PATH}"
 export LD_LIBRARY_PATH="${FREELAN_INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
 export PATH="${FREELAN_INSTALL_PREFIX}/bin:${PATH}"
 
-# Add home-brew boost installation
-BOOST_INSTALL_PREFIX=/usr/local/opt/boost
-#BOOST_INSTALL_PREFIX=/opt/boxen/homebrew/opt/boost/
-export CPLUS_INCLUDE_PATH="${BOOST_INSTALL_PREFIX}/include:${CPLUS_INCLUDE_PATH}"
-export C_INCLUDE_PATH="${BOOST_INSTALL_PREFIX}/include:${C_INCLUDE_PATH}"
-export LIBRARY_PATH="${BOOST_INSTALL_PREFIX}/lib:${LIBRARY_PATH}"
-export LD_LIBRARY_PATH="${BOOST_INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
-export PATH="${BOOST_INSTALL_PREFIX}/bin:${PATH}"
-
-# Add home-brew openssl installation
-OPENSSL_INSTALL_PREFIX=/usr/local/opt/openssl
-#OPENSSL_INSTALL_PREFIX=/opt/boxen/homebrew/opt/openssl
-export CPLUS_INCLUDE_PATH="${OPENSSL_INSTALL_PREFIX}/include:${CPLUS_INCLUDE_PATH}"
-export C_INCLUDE_PATH="${OPENSSL_INSTALL_PREFIX}/include:${C_INCLUDE_PATH}"
-export LIBRARY_PATH="${OPENSSL_INSTALL_PREFIX}/lib:${LIBRARY_PATH}"
-export LD_LIBRARY_PATH="${OPENSSL_INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}"
-export PATH="${OPENSSL_INSTALL_PREFIX}/bin:${PATH}"
+# Add third-party installation
+export CPLUS_INCLUDE_PATH="${FREELAN_THIRD_PARTY_ROOT}/include:${CPLUS_INCLUDE_PATH}"
+export C_INCLUDE_PATH="${FREELAN_THIRD_PARTY_ROOT}/include:${C_INCLUDE_PATH}"
+export LIBRARY_PATH="${FREELAN_THIRD_PARTY_ROOT}/lib:${LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${FREELAN_THIRD_PARTY_ROOT}/lib:${LD_LIBRARY_PATH}"
+export PATH="${FREELAN_THIRD_PARTY_ROOT}/bin:${PATH}"
 
 # Fake ldconfig
 export FREELAN_FAKE_LDCONFIG=1
@@ -63,10 +55,6 @@ export PYTHONPATH="${FREELAN_ALL_ROOT}/freelan-buildtools:$PYTHONPATH"
 # Make the environment history local
 export HISTFILE="${FREELAN_ALL_ROOT}/.bash_history"
 
-# Boost suffix
-export FREELAN_RELEASE_BOOST_SUFFIX=-mt
-export FREELAN_DEBUG_BOOST_SUFFIX=-mt
-
 # This adds a prefix to the PS1
 # To enable the feature, modify your PS1 so that it starts with ${PS1_PREFIX}.
 export PS1_PREFIX="[freelan] "