Merge pull request #2139 from mboes/java

Add jni, jvm, inline-java, sparkle once more.
This commit is contained in:
Michael Snoyman 2016-12-18 09:37:07 +02:00 committed by GitHub
commit 9dade46d94

View File

@ -1566,6 +1566,9 @@ packages:
- distributed-closure
- H
- inline-r
- jni
- jvm
- sparkle
- th-lift
"Christopher Reichert <creichert07@gmail.com> @creichert":
@ -2320,8 +2323,6 @@ packages:
"Alp Mestanogullari <alpmestan@gmail.com> @alpmestan":
- taggy
- taggy-lens
# 0.1 Compilation failure https://github.com/fpco/stackage/issues/1660 - inline-java
# via inline-java - sparkle
"Alex McLean <lxyxpx@gmail.com> @yaxu":
- tidal
@ -2813,11 +2814,15 @@ configure-args:
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
sparkle:
- --extra-lib-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include
- --extra-include-dirs
- /usr/lib/jvm/java-8-openjdk-amd64/include/linux
hocilib:
- --extra-lib-dirs
- /usr/local/lib
@ -2980,6 +2985,7 @@ expected-test-failures:
- hedis
- hocilib # oracle
- hworker
- jvm
- katip-elasticsearch # elasticsearch
- log # ElasticSearch
- mangopay # https://github.com/prowdsponsor/mangopay/issues/30