ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

prevent openjdk-src build from trying to load the installed 'JavaRuntimeSupport' (fixes #128)

Browse Source
This commit is contained in:
Joshua Warner 2013-12-07 18:49:23 -07:00
parent 773417ab2b
commit 94f5888f97
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makefile
View File

@ -220,9 +220,9 @@ ifneq ($(android),)
$(platform-lflags) \ $(platform-lflags) \
-lstdc++ -lstdc++
ifeq ($(platform),linux) ifeq ($(platform),linux)
classpath-lflags += -lrt classpath-lflags += -lrt
endif endif
classpath-objects = \ classpath-objects = \
$(call cpp-objects,$(luni-cpps),$(luni-native),$(build)) \ $(call cpp-objects,$(luni-cpps),$(luni-native),$(build)) \
@ -1970,6 +1970,9 @@ ifeq ($(ios),true)
< "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \ < "$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c" \
> $(build)/openjdk/UNIXProcess_md.c > $(build)/openjdk/UNIXProcess_md.c
endif endif
if [ -f openjdk-patches/$(notdir $(<)).patch ]; then \
( cd $(build) && patch -p0 ) < openjdk-patches/$(notdir $(<)).patch; \
fi
$(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \ $(cc) -fPIC $(openjdk-extra-cflags) $(openjdk-cflags) \
$(optimization-cflags) -w -c $(build)/openjdk/$(notdir $(<)) \ $(optimization-cflags) -w -c $(build)/openjdk/$(notdir $(<)) \
$(call output,$(@)) -Wno-return-type $(call output,$(@)) -Wno-return-type

15
openjdk-patches/java_props_macosx.c.patch Normal file
View File

@ -0,0 +1,15 @@
--- openjdk/java_props_macosx.c
+++ openjdk/java_props_macosx.c
@@ -37,11 +37,7 @@
// need dlopen/dlsym trick to avoid pulling in JavaRuntimeSupport before libjava.dylib is loaded
static void *getJRSFramework() {
- static void *jrsFwk = NULL;
- if (jrsFwk == NULL) {
- jrsFwk = dlopen("/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/JavaRuntimeSupport", RTLD_LAZY | RTLD_LOCAL);
- }
- return jrsFwk;
+ return NULL;
}
static char *getPosixLocale(int cat) {