Waldemar Brodkorb пре 10 година
родитељ
комит
8c68f7e1df
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      package/ant/Makefile
  2. 1 1
      package/ecj/Makefile

+ 1 - 1
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 ; \

+ 1 - 1
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