KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try and figure out why linking against python is failing on OS X Travis

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-10 12:45:33 +05:30
parent 0e40470931
commit 7c580dca31
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -47,9 +47,10 @@ matrix:
install: | install: |
if [[ "$RUN_FLAKE" == "1" ]]; then pip install flake8; fi if [[ "$RUN_FLAKE" == "1" ]]; then pip install flake8; fi
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then if [[ "$TRAVIS_OS_NAME" == 'osx' ]]; then
python3 -m venv venv; python3 -m venv venv;
source venv/bin/activate; source venv/bin/activate;
python3 -m sysconfig
else else
wget -O glfw-3.2.1.zip https://github.com/glfw/glfw/archive/3.2.1.zip wget -O glfw-3.2.1.zip https://github.com/glfw/glfw/archive/3.2.1.zip
unzip glfw-3.2.1.zip unzip glfw-3.2.1.zip
@ -67,11 +68,7 @@ env:
- LD_LIBRARY_PATH=$HOME/glfw/lib - LD_LIBRARY_PATH=$HOME/glfw/lib
- ASAN_OPTIONS=leak_check_at_exit=0 - ASAN_OPTIONS=leak_check_at_exit=0
before_script: before_script:
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then - python setup.py build --debug $ASAN_ARG;
python setup.py build;
else
python setup.py build --debug $ASAN_ARG;
fi
script: script:
- LD_PRELOAD=$ASANLIB python setup.py test - LD_PRELOAD=$ASANLIB python setup.py test
- if [[ "$RUN_FLAKE" == "1" ]]; then flake8 --count .; fi - if [[ "$RUN_FLAKE" == "1" ]]; then flake8 --count .; fi

6
setup.py
View File

@ -52,8 +52,10 @@ def get_python_flags(cflags):
for var in 'data include scripts'.split(): for var in 'data include scripts'.split():
val = sysconfig.get_path(var) val = sysconfig.get_path(var)
if val and '/{}.framework'.format(fw) in val: if val and '/{}.framework'.format(fw) in val:
libs.append('-F' + val[:val.index('/{}.framework'.format(fw))]) fdir = val[:val.index('/{}.framework'.format(fw))]
libs += ['-framework', sysconfig.get_config_var('PYTHONFRAMEWORK')] libs.append('-F' + fdir)
break
libs.extend(['-framework', fw])
else: else:
libs += ['-L' + sysconfig.get_config_var('LIBDIR')] libs += ['-L' + sysconfig.get_config_var('LIBDIR')]
libs += ['-lpython' + sysconfig.get_config_var('VERSION') + sys.abiflags] libs += ['-lpython' + sysconfig.get_config_var('VERSION') + sys.abiflags]