diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-03 17:11:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-04 17:54:51 +0200 |
| commit | eb339e5dacc4d6333fe8cf55c9f79ab64a7e3809 (patch) | |
| tree | 5f6b7d4cdaf0956fdbe1f074d75ebf390b412e66 | |
| parent | 557bd959d183fd33ec81b14d5c0a3ac002562171 (diff) | |
fix openjdk build, do not interfere with xbmc
| -rw-r--r-- | package/ecj/Makefile | 4 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/ecj/Makefile b/package/ecj/Makefile index c8eb49488..5f0ad156c 100644 --- a/package/ecj/Makefile +++ b/package/ecj/Makefile @@ -33,8 +33,8 @@ ecj-hostinstall: # put a wrapper for java here mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/java - chmod u+x ${STAGING_HOST_DIR}/usr/bin/java + ${STAGING_HOST_DIR}/usr/bin/hostjava + chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ ${STAGING_HOST_DIR}/usr/bin/gij chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 9147f5dbb..5a9e822a0 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -114,9 +114,9 @@ HOST_CONFIGURE_ARGS+=\ --enable-bootstrap \ --enable-zero \ --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_HOST_DIR)/usr/bin/java \ + --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${DL_DIR}/ecj.jar \ + --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ --without-hotspot-build \ --disable-system-zlib \ --disable-system-jpeg \ |