.travis.yml: Attempt to fix openssl issues on osx

diff --git a/.travis.yml b/.travis.yml
index ad910b4..1ca2cd0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link openssl --force ; fi
 
 script:
   - make -j1 V=1 ENABLE_SSL=y

diff --git a/default.cf b/default.cf
index 8c9aa81..fc8cba4 100644 (file)
--- a/default.cf
+++ b/default.cf
@@ -81,7 +81,7 @@ endif
 
 # HARD CODED PLATFORM-SPECIFIC OPTIONS
 LDFLAGS +=$(if $(LINUX_TARGET), -Wl$(comma)--no-undefined,)
-LDFLAGS +=$(if $(OSX_TARGET), -framework cocoa -framework OpenGL,)
+LDFLAGS +=$(if $(OSX_TARGET), -framework cocoa -framework OpenGL -L/usr/local/opt/openssl/lib,)
 
 ifdef BSD_TARGET
 EXCLUDED_LIBS += $(space)dl
@@ -90,7 +90,7 @@ LDFLAGS += -L/usr/local/lib
 endif
 
 ifdef OSX_TARGET
-CFLAGS += -I$(SYSROOT)/usr/include/ffi
+CFLAGS += -I$(SYSROOT)/usr/include/ffi -I$(SYSROOT)/usr/local/opt/openssl/include
 else
 # OFLAGS += -L/usr/lib/$(TARGET_ARCH)/ec
 endif