wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

back port aldenml's patch from master to fix brew issue

This commit is contained in:
arvidn 2017-09-22 05:54:22 -07:00 committed by Arvid Norberg
parent 5441874f10
commit 08e861cca9
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -9,13 +9,13 @@ matrix:
- env: variant=test_debug lang=cpp11 sim=0 coverage=0 target=osx-tests - env: variant=test_debug lang=cpp11 sim=0 coverage=0 target=osx-tests
os: osx os: osx
osx_image: xcode6.4 osx_image: xcode7.3
- env: variant=test_release lang=cpp11 sim=0 coverage=0 docs=1 target=osx-tests - env: variant=test_release lang=cpp11 sim=0 coverage=0 docs=1 target=osx-tests
os: osx os: osx
osx_image: xcode6.4 osx_image: xcode7.3
- env: variant=test_debug lang=cpp98 sim=0 coverage=0 target=osx-tests - env: variant=test_debug lang=cpp98 sim=0 coverage=0 target=osx-tests
os: osx os: osx
osx_image: xcode6.4 osx_image: xcode7.3
git: git:
submodules: false submodules: false
@ -47,14 +47,14 @@ addons:
before_install: before_install:
- git submodule update --init --recursive - git submodule update --init --recursive
- if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install --quiet ccache boost-build boost-python; fi - if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install ccache boost-build boost-python; fi
- 'if [[ $TRAVIS_OS_NAME == "osx" && $docs = "1" ]]; then - 'if [[ $TRAVIS_OS_NAME == "osx" && $docs = "1" ]]; then
easy_install --user docutils; easy_install --user docutils;
mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages; mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages;
echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth; echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth;
easy_install --user Pygments; easy_install --user Pygments;
easy_install --user aafigure; easy_install --user aafigure;
brew install --quiet graphviz hunspell; brew install graphviz hunspell;
easy_install --user Pillow; easy_install --user Pillow;
fi' fi'

14
Jamfile
View File

@ -30,7 +30,6 @@ else
{ {
local boost-lib-search-path = local boost-lib-search-path =
<search>/opt/local/lib <search>/opt/local/lib
<search>/usr/lib
<search>/usr/local/lib <search>/usr/local/lib
<search>/sw/lib <search>/sw/lib
<search>/usr/g++/lib <search>/usr/g++/lib
@ -547,13 +546,18 @@ lib gcc : : <name>gcc <link>static ;
# when using iconv # when using iconv
lib libiconv : : <name>iconv <link>shared <search>/usr/local/lib ; lib libiconv : : <name>iconv <link>shared <search>/usr/local/lib ;
# openssl on linux/bsd/macos etc. # openssl on linux/bsd etc.
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ; lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib z : : <link>shared <name>z <search>/usr/lib ; lib z : : <link>shared <name>z ;
lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z : : <include>/opt/local/include ;
lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib : : <include>/opt/local/include ;
lib dl : : <link>shared <name>dl ; lib dl : : <link>shared <name>dl ;
# pick up openssl on macos from brew
lib crypto : : <name>crypto <use>z <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
lib ssl : : <name>ssl <use>crypto <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
lib crypto : : <name>crypto <use>z : <link>shared ;
lib ssl : : <name>ssl <use>crypto : <link>shared ;
# time functions used on linux require librt # time functions used on linux require librt
lib librt : : <name>rt <link>shared ; lib librt : : <name>rt <link>shared ;