From 8c68f7e1dfb5e1a7feea81afbc58e0ac0517ec3e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 27 May 2014 14:12:23 +0200 Subject: fix ecj dl --- package/ant/Makefile | 2 +- package/ecj/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ant/Makefile b/package/ant/Makefile index fda2e54c9..6c75bc0de 100644 --- a/package/ant/Makefile +++ b/package/ant/Makefile @@ -28,7 +28,7 @@ host-build: if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \ fi - cp $(DL_DIR)/ecj.jar $(WRKBUILD)/lib/optional + cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \ diff --git a/package/ecj/Makefile b/package/ecj/Makefile index 25fbaae1f..73c55556f 100644 --- a/package/ecj/Makefile +++ b/package/ecj/Makefile @@ -26,7 +26,7 @@ ecj-hostinstall: $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(DL_DIR)/ecj.jar + $(DL_DIR)/${PKG_NAME}-${PKG_VERSION}.jar echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ ${STAGING_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj -- cgit v1.2.3