diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
| commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
| tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /jtools | |
| parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
| parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/ecj/Makefile | 9 | ||||
| -rw-r--r-- | jtools/gcj/Makefile | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index 32cfdeb53..a67e9ebd8 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -18,9 +18,16 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \ $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \ - -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \ + -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar $(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \ + ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj + chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj + # put a wrapper for java here + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \ + ${STAGING_JAVA_HOST_DIR}/usr/bin/java + chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java include $(TOPDIR)/mk/tools.mk diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index ea41ca671..7ccd03c15 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -26,9 +26,9 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --enable-java-home \ --enable-languages=java \ --with-ffi \ - --with-mpc=$(STAGING_HOST_DIR) \ - --with-mpfr=$(STAGING_HOST_DIR) \ - --with-gmp=$(STAGING_HOST_DIR) \ + --with-mpc=$(STAGING_HOST_DIR)/usr \ + --with-mpfr=$(STAGING_HOST_DIR)/usr \ + --with-gmp=$(STAGING_HOST_DIR)/usr \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ |