mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Moved fetching of ecj.jar from the post-patch target using the

Browse Source 
contrib/download_ecj script to the fetch phase using extra MASTER_SITES
  and DISTFILES. Pointyhat does not allow fetching outside of the
  fetch phase, and the size and checksums of ecj.jar need to be recorded
  in distinfo.

Reported by:	pointyhat (pav)
Approved by:	gerald (via private email)
This commit is contained in:
Greg Larkin 2010-01-08 16:18:57 +00:00
parent e520e4da39
commit 50818aaf50
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247404
3 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/gcc42/Makefile
View File

@ -79,7 +79,12 @@ INFO= gcc${SUFFIX}/cpp \
gcc${SUFFIX}/libgomp gcc${SUFFIX}/libgomp
.if ! defined(WITHOUT_JAVA) .if ! defined(WITHOUT_JAVA)
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} ECJ_JAR= ecj-4.3.jar
MASTER_SITES+= ${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
MASTER_SITE_SUBDIR+= java/:ecj
DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
${ECJ_JAR}:ecj
EXTRACT_ONLY= ${DISTFILES:S|${ECJ_JAR}:ecj||}
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier
# FIXME: we are currently getting weird build failures with libjava on # FIXME: we are currently getting weird build failures with libjava on
@ -99,8 +104,9 @@ MAN1+= gcj${SUFFIX}.1 \
INFO+= gcc${SUFFIX}/gcj INFO+= gcc${SUFFIX}/gcj
PLIST_SUB+= JAVA="" PLIST_SUB+= JAVA=""
# Preps the source tree for the gcj build
post-patch:: post-patch::
@cd ${SRCDIR} && ${CHMOD} 755 ./contrib/download_ecj && ./contrib/download_ecj @${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
.else .else
CONFIGURE_ARGS+=--disable-libgcj CONFIGURE_ARGS+=--disable-libgcj

3
lang/gcc42/distinfo
View File

@ -7,6 +7,9 @@ SIZE (gcc-g++-4.2-20090325.tar.bz2) = 4826743
MD5 (gcc-objc-4.2-20090325.tar.bz2) = 4f90a23bf249df24682e5fc1d4042a23 MD5 (gcc-objc-4.2-20090325.tar.bz2) = 4f90a23bf249df24682e5fc1d4042a23
SHA256 (gcc-objc-4.2-20090325.tar.bz2) = ed7489522fbfb9ed6be9a028e3fe73018d406e206f4dd9d79b892c4b04bd3366 SHA256 (gcc-objc-4.2-20090325.tar.bz2) = ed7489522fbfb9ed6be9a028e3fe73018d406e206f4dd9d79b892c4b04bd3366
SIZE (gcc-objc-4.2-20090325.tar.bz2) = 196233 SIZE (gcc-objc-4.2-20090325.tar.bz2) = 196233
MD5 (ecj-4.3.jar) = fd299f26c02268878b5d6c0e86f57c43
SHA256 (ecj-4.3.jar) = 9de193ea393ed50d868b730bad6916f7a8ef4ba80216f8606d3e1a0dd886e74b
SIZE (ecj-4.3.jar) = 1377431
MD5 (gcc-java-4.2-20090325.tar.bz2) = 8559d9452a0ae29b935214b71baf5dfd MD5 (gcc-java-4.2-20090325.tar.bz2) = 8559d9452a0ae29b935214b71baf5dfd
SHA256 (gcc-java-4.2-20090325.tar.bz2) = b5f3c1088e89d605bfee5dbfd25c77dd94b4c583ea7ff4a4c347899a76ce682e SHA256 (gcc-java-4.2-20090325.tar.bz2) = b5f3c1088e89d605bfee5dbfd25c77dd94b4c583ea7ff4a4c347899a76ce682e
SIZE (gcc-java-4.2-20090325.tar.bz2) = 10405140 SIZE (gcc-java-4.2-20090325.tar.bz2) = 10405140

28
lang/gcc42/files/patch-contrib__download_ecj
View File

@ -1,28 +0,0 @@
--- ./contrib/download_ecj.orig 2009-12-10 13:52:02.000000000 -0500
+++ ./contrib/download_ecj 2009-12-10 13:52:02.000000000 -0500
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+#
+# Download the ecj jar file needed by gcj.
+# Run this from the top level of the gcc source tree and the libjava
+# build will do the right thing.
+#
+# (C) 2006 Free Software Foundation
+#
+# This script is Free Software, and it can be copied, distributed and
+# modified as defined in the GNU General Public License. A copy of
+# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
+#
+
+ftp -n sourceware.org << EOF
+verbose
+hash
+user ftp ''
+cd /pub/java
+binary
+get ecj-latest.jar
+EOF
+
+mv ecj-latest.jar ecj.jar
+