diff options
| author | Sean Owen <sowen@cloudera.com> | 2015-02-18 14:41:44 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-02-18 14:41:44 +0000 |
| commit | 5aecdcf1f23a826f6236096001de1dd811dbc443 (patch) | |
| tree | 422494fe0fb4664d22281fa02d1637911cc108da /assembly | |
| parent | 82197ed3bd4b8c29b0c4b183994753f0e02b6903 (diff) | |
| download | spark-5aecdcf1f23a826f6236096001de1dd811dbc443.tar.gz spark-5aecdcf1f23a826f6236096001de1dd811dbc443.tar.bz2 spark-5aecdcf1f23a826f6236096001de1dd811dbc443.zip | |
SPARK-5669 [BUILD] [HOTFIX] Spark assembly includes incompatibly licensed libgfortran, libgcc code via JBLAS
Correct exclusion path for JBLAS native libs.
(More explanation coming soon on the mailing list re: 1.3.0 RC1)
Author: Sean Owen <sowen@cloudera.com>
Closes #4673 from srowen/SPARK-5669.2 and squashes the following commits:
e29693c [Sean Owen] Correct exclusion path for JBLAS native libs
Diffstat (limited to 'assembly')
| -rw-r--r-- | assembly/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index fbb6e94839..3d1ed0dd8a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -119,9 +119,9 @@ <artifact>org.jblas:jblas</artifact> <excludes> <!-- Linux amd64 is OK; not statically linked --> - <exclude>lib/Linux/i386/**</exclude> - <exclude>lib/Mac OS X/**</exclude> - <exclude>lib/Windows/**</exclude> + <exclude>lib/static/Linux/i386/**</exclude> + <exclude>lib/static/Mac OS X/**</exclude> + <exclude>lib/static/Windows/**</exclude> </excludes> </filter> </filters> |