mirror of
https://github.com/xerial/snappy-java.git
synced 2025-04-08 19:35:08 +02:00
Fixes for compiling on AIX.
This commit is contained in:
parent
6a582ce60a
commit
3a833a730b
2
Makefile
2
Makefile
@ -56,7 +56,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/s
|
|||||||
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
|
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
|
||||||
|
|
||||||
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
|
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
|
||||||
$(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative
|
$(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative
|
||||||
|
|
||||||
ifndef USE_GIT
|
ifndef USE_GIT
|
||||||
$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
|
$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
|
||||||
|
@ -66,7 +66,7 @@ CROSS_PREFIX :=
|
|||||||
Default_CXX := $(CROSS_PREFIX)g++
|
Default_CXX := $(CROSS_PREFIX)g++
|
||||||
Default_STRIP := $(CROSS_PREFIX)strip
|
Default_STRIP := $(CROSS_PREFIX)strip
|
||||||
Default_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
|
Default_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
|
||||||
Default_LINKFLAGS := -shared -static
|
Default_LINKFLAGS := -shared -static -lcrypt
|
||||||
Default_LIBNAME := libsnappyjava.so
|
Default_LIBNAME := libsnappyjava.so
|
||||||
Default_SNAPPY_FLAGS :=
|
Default_SNAPPY_FLAGS :=
|
||||||
|
|
||||||
|
@ -140,7 +140,12 @@ public class OSInfo
|
|||||||
else if (osName.contains("Linux")) {
|
else if (osName.contains("Linux")) {
|
||||||
return "Linux";
|
return "Linux";
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
|
|
||||||
|
else if ( osName.contains("AIX")) {
|
||||||
|
return "AIX";
|
||||||
|
}
|
||||||
|
else {
|
||||||
return osName.replaceAll("\\W", "");
|
return osName.replaceAll("\\W", "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user