diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-17 12:12:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-17 12:13:07 +0200 |
| commit | 7c3ac2dd03fae0e683c3adad60d80fa666bd9967 (patch) | |
| tree | b359da41f3a2a3544f2f652c456e3b465e2b856f | |
| parent | e0ef67bee7a15cb5d635e5301f609999bf2e8c30 (diff) | |
move ecj.jar download to ecj package
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | package/ecj/Makefile | 6 | ||||
| -rw-r--r-- | package/gcj/Makefile | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 537633139..30bf39247 100644 --- a/mk/vars.mk +++ b/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 ;; \ diff --git a/package/ecj/Makefile b/package/ecj/Makefile index 8bba31865..25fbaae1f 100644 --- a/package/ecj/Makefile +++ b/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 diff --git a/package/gcj/Makefile b/package/gcj/Makefile index 8273f06b2..cfa642704 100644 --- a/package/gcj/Makefile +++ b/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 |