Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-32 ac306c5e0 -> e5e50db4b


Rebuilt shmem for Mac


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb4c3956
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb4c3956
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb4c3956

Branch: refs/heads/ignite-32
Commit: bb4c39560cd9ec9531acbdfa36bc58d3a92adda5
Parents: 3032bee
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Fri Dec 19 13:25:11 2014 +0300
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Fri Dec 19 13:25:11 2014 +0300

----------------------------------------------------------------------
 ipc/shmem/ggshmem/Makefile.am                   |   2 +-
 ipc/shmem/ggshmem/Makefile.in                   |   2 +-
 .../java/META-INF/native/osx/libggshmem.dylib   | Bin 29312 -> 32940 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb4c3956/ipc/shmem/ggshmem/Makefile.am
----------------------------------------------------------------------
diff --git a/ipc/shmem/ggshmem/Makefile.am b/ipc/shmem/ggshmem/Makefile.am
index 81582f3..d0d054b 100644
--- a/ipc/shmem/ggshmem/Makefile.am
+++ b/ipc/shmem/ggshmem/Makefile.am
@@ -18,6 +18,6 @@ libggshmem_la_LDFLAGS =
 
 # Compiler options. Here we are adding the include directory
 # to be searched for headers included in the source code.
-libggshmem_la_CPPFLAGS = -I$(top_srcdir)/include -I$(JAVA_HOME)/include 
-I$(JAVA_HOME)/include/linux \
+libggshmem_la_CPPFLAGS = -I$(top_srcdir)/include -I$(JAVA_HOME)/include 
-I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include/darwin \
 -I/System/Library/Frameworks/JavaVM.framework/Headers
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb4c3956/ipc/shmem/ggshmem/Makefile.in
----------------------------------------------------------------------
diff --git a/ipc/shmem/ggshmem/Makefile.in b/ipc/shmem/ggshmem/Makefile.in
index 5875f29..77abcd8 100644
--- a/ipc/shmem/ggshmem/Makefile.in
+++ b/ipc/shmem/ggshmem/Makefile.in
@@ -263,7 +263,7 @@ libggshmem_la_LDFLAGS =
 
 # Compiler options. Here we are adding the include directory
 # to be searched for headers included in the source code.
-libggshmem_la_CPPFLAGS = -I$(top_srcdir)/include -I$(JAVA_HOME)/include 
-I$(JAVA_HOME)/include/linux \
+libggshmem_la_CPPFLAGS = -I$(top_srcdir)/include -I$(JAVA_HOME)/include 
-I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include/darwin \
 -I/System/Library/Frameworks/JavaVM.framework/Headers
 
 all: all-am

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb4c3956/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib 
b/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib
index e8f0589..bfee82f 100755
Binary files a/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib 
and b/modules/core/src/main/java/META-INF/native/osx/libggshmem.dylib differ

Reply via email to