瀏覽代碼

move ecj.jar download to ecj package

Waldemar Brodkorb 10 年之前
父節點
當前提交
7c3ac2dd03
共有 3 個文件被更改,包括 5 次插入11 次删除
  1. 2 2
      mk/vars.mk
  2. 3 3
      package/ecj/Makefile
  3. 0 6
      package/gcj/Makefile

+ 2 - 2
mk/vars.mk

@@ -245,8 +245,8 @@ EXTRACT_CMD=		PATH='${HOST_PATH}'; mkdir -p ${WRKDIR}; \
 				bzip2 -dc $$file | tar -xf - ;; \
 			*.zip) \
 				cat $$file | cpio -ivd -H zip ;; \
-			*.arm) \
-				cp $$file ${WRKDIR} ;; \
+			*.arm|*.jar) \
+				mkdir ${WRKBUILD}; cp $$file ${WRKBUILD} ;; \
 			*) \
 				echo "Cannot extract '$$file'" >&2; \
 				false ;; \

+ 3 - 3
package/ecj/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ecj
 PKG_VERSION:=		4.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
+PKG_MD5SUM:=		7339f199ba11c941890031fd9981d7be
 PKG_DESCR:=		ecj java compiler
 PKG_SECTION:=		lang
+PKG_SITES:=		ftp://sourceware.org/pub/java/
 
 PKG_CFLINE_ECJ:=	depends on ADK_HOST_ONLY
-
-NO_DISTFILES:=		1
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.jar
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk

+ 0 - 6
package/gcj/Makefile

@@ -12,9 +12,7 @@ PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 
 PKG_CFLINE_GCJ:=	depends on ADK_HOST_ONLY
-
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
-
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include $(TOPDIR)/mk/host.mk
@@ -42,9 +40,5 @@ HOST_CONFIGURE_ARGS:=	--enable-dependency-tracking \
 			--disable-multilib \
 			--disable-bootstrap
 
-post-extract:
-	(cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
-	(cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .)
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk