diff options
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | RELEASE-NOTES.md | 3 |
4 files changed, 25 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5bc64eb..b8fab76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,23 @@ matrix: packages: - libgsl-dev - libopenblas-dev + - os: linux + compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libgsl-dev + - libopenblas-dev + - os: osx + compiler: clang script: - echo $MATRIX_EVAL - eval "${MATRIX_EVAL}" - $CXX --version - - make -j 4 OPENBLAS_LEGACY=1 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENBLAS="$(brew --prefix openblas)" ; fi + - echo $OPENBLAS + - make -j 4 CXX=$CXX WITH_OPENBLAS=1 OPENBLAS_LEGACY=1 - make OPENBLAS_LEGACY=1 fast-check diff --git a/Makefile b/Makefile index 246cf6f..92e55b9 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ else endif ifeq ($(CPP), clang++) - GCC_FLAGS=-std=c++11 -isystem$(OPENBLAS_INCLUDE_PATH) + GCC_FLAGS=-std=c++11 -isystem$(OPENBLAS_INCLUDE_PATH) ifdef GUIX CPPFLAGS += -I$(GUIX)/include/c++ -I$(GUIX)/include/c++/x86_64-unknown-linux-gnu endif @@ -158,6 +158,11 @@ static: CPPFLAGS += -static LIBS += -lgsl -lz ifdef WITH_OPENBLAS LIBS += -lopenblas + ifeq ($(SYS), OSX) + ifdef WITH_OPENBLAS + LIBS += -Wl,-L/usr/local/opt/openblas/lib + endif + endif else LIBS += -latlas -lcblas -llapack -lblas endif diff --git a/README.md b/README.md index d6f7275..97ef042 100644 --- a/README.md +++ b/README.md @@ -253,7 +253,7 @@ program and the contents of the .log.txt file in the output directory. ### Check list: -1. [X] I have found and issue with GEMMA +1. [X] I have found an issue with GEMMA 2. [ ] I have searched for it on the [issue tracker](https://github.com/genetics-statistics/GEMMA/issues?q=is%3Aissue) (incl. closed issues) 3. [ ] I have searched for it on the [mailing list](https://groups.google.com/forum/#!forum/gemma-discussion) 4. [ ] I have tried the latest [release](https://github.com/genetics-statistics/GEMMA/releases) of GEMMA diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 4345c27..7d8b633 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -6,6 +6,9 @@ and ## ChangeLog v0.98.3 (2020/?) +* Fix Travis build with gcc 5.5 (OpenBLAS related round-offs) +* Fix Travis build on OSX (brew related) +* GEMMA installs on FreeBSD (thanks @outpaddling) ## ChangeLog v0.98.2 (2019/05/28) |