Skip to content

Commit

Permalink
* Fixed issue with deb_installer
Browse files Browse the repository at this point in the history
* Removed python compilation in Travis CI for Mac OS
  • Loading branch information
jredmondson committed Jul 12, 2018
1 parent 3db8971 commit ff05270
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ matrix:
os: osx
osx_image: xcode9.3

# clang, osx, python
- compiler: clang
env: NAME="OSX 10.13 clang python" CLANG="clang" PYTHON="python"
os: osx
osx_image: xcode9.3

# clang, osx, simtime
- compiler: clang
env: NAME="OSX 10.13 clang simtime" CLANG="clang" SIMTIME="simtime"
Expand Down
2 changes: 1 addition & 1 deletion installer/debian/deb_installer_ia64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ mkdir -p $ROOT_DIR/doc/madara
# we want to add the new LD_LIBRARY_PATH
echo "Updating ld.so.conf.d"
mkdir -p etc/ld.so.conf.d
echo $ROOT_DIR/lib >> etc/ld.so.conf.d/madara.conf
echo /$ROOT_DIR/lib >> etc/ld.so.conf.d/madara.conf

if [ $DEPENDS_ZEROMQ -eq 1 ] ; then
cp /usr/local/lib/libzmq.so* $ROOT_DIR/lib/
Expand Down

0 comments on commit ff05270

Please sign in to comment.