sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Revert the change to create a build dependency on the bootstrapping JDK

Browse source 
if it already exists.  Since the bootstrap JDK can be an already
  installed instance of itself this creates a circular dependency which
  breaks portmaster and possibly other port management tools.
This commit is contained in:
Greg Lewis 2008-08-25 03:25:31 +00:00
parent f291d081d5
commit ae29a3bbe3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=219130
2 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
java/jdk15/Makefile
View file

@ -62,18 +62,16 @@ TZUPDATE_TZVERSION= 2008c
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if !defined(WITH_LINUX_BOOTSTRAP) .if !defined(WITH_LINUX_BOOTSTRAP)
NATIVE_BOOTSTRAP_JDKS= \ NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/diablo-jdk1.6.0 \
${LOCALBASE}/diablo-jdk1.6.0:${PORTSDIR}/java/diablo-jdk16 \ ${LOCALBASE}/diablo-jdk1.5.0 \
${LOCALBASE}/diablo-jdk1.5.0:${PORTSDIR}/java/diablo-jdk15 \ ${LOCALBASE}/jdk1.5.0 \
${LOCALBASE}/jdk1.5.0:${PORTSDIR}/java/jdk15 \ ${LOCALBASE}/jdk1.6.0 \
${LOCALBASE}/jdk1.6.0:${PORTSDIR}/java/jdk16 \ ${LOCALBASE}/jdk1.4.2
${LOCALBASE}/jdk1.4.2:${PORTSDIR}/java/jdk14
.endif .endif
LINUX_BOOTSTRAP_JDKS= \ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.5.0 \
${LOCALBASE}/linux-sun-jdk1.5.0:${PORTSDIR}/java/linux-sun-jdk15 \ ${LOCALBASE}/linux-sun-jdk1.6.0 \
${LOCALBASE}/linux-sun-jdk1.6.0:${PORTSDIR}/java/linux-sun-jdk16 \ ${LOCALBASE}/linux-sun-jdk1.4.2
${LOCALBASE}/linux-sun-jdk1.4.2:${PORTSDIR}/java/linux-sun-jdk14
.if defined(WITH_IPV6) .if defined(WITH_IPV6)
CATEGORIES+= ipv6 CATEGORIES+= ipv6
@ -92,9 +90,8 @@ EXTRACT_ONLY+= ${TZUPDATEFILE}
# do we have valid native jdk installed? # do we have valid native jdk installed?
.if !defined(WITH_LINUX_BOOTSTRAP) .if !defined(WITH_LINUX_BOOTSTRAP)
.for CJDK in ${NATIVE_BOOTSTRAP_JDKS} .for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK:C/:.*$//}/bin/javac) . if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
BOOTSTRAPJDKDIR= ${CJDK:C/:.*$//} BOOTSTRAPJDKDIR= ${CJDK}
BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://}
. endif . endif
.endfor .endfor
.endif .endif
@ -102,9 +99,8 @@ BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://}
# do we have valid linux jdk installed? # do we have valid linux jdk installed?
.if !defined(BOOTSTRAPJDKDIR) .if !defined(BOOTSTRAPJDKDIR)
.for CJDK in ${LINUX_BOOTSTRAP_JDKS} .for CJDK in ${LINUX_BOOTSTRAP_JDKS}
. if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK:C/:.*$//}/bin/javac) . if !defined(BOOTSTRAPJDKDIR) && exists(${CJDK}/bin/javac)
BOOTSTRAPJDKDIR= ${CJDK:C/:.*$//} BOOTSTRAPJDKDIR= ${CJDK}
BUILD_DEPENDS+= ${CJDK:C/:.*$//}/bin/javac:${CJDK:C/^[^:]*://}
WITH_LINUX_BOOTSTRAP= YES WITH_LINUX_BOOTSTRAP= YES
. endif . endif
.endfor .endfor

55
java/jdk16/Makefile
View file

@ -61,8 +61,11 @@ LATEST_LINK= jdk16
TZUPDATE_VERSION= 1_3_6 TZUPDATE_VERSION= 1_3_6
TZUPDATE_TZVERSION= 2008c TZUPDATE_TZVERSION= 2008c
.include <bsd.port.pre.mk>
.if !defined(WITH_LINUX_BOOTSTRAP) .if !defined(WITH_LINUX_BOOTSTRAP)
NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0 \ NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/diablo-jdk1.6.0 \
${LOCALBASE}/diablo-jdk1.5.0 \
${LOCALBASE}/jdk1.6.0 \ ${LOCALBASE}/jdk1.6.0 \
${LOCALBASE}/jdk1.5.0 ${LOCALBASE}/jdk1.5.0
.endif .endif
@ -70,8 +73,6 @@ NATIVE_BOOTSTRAP_JDKS+= ${LOCALBASE}/diablo-jdk1.5.0 \
LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.6.0 \ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.6.0 \
${LOCALBASE}/linux-sun-jdk1.5.0 ${LOCALBASE}/linux-sun-jdk1.5.0
.include <bsd.port.pre.mk>
.if defined(WITH_IPV6) .if defined(WITH_IPV6)
CATEGORIES+= ipv6 CATEGORIES+= ipv6
.endif .endif
@ -107,11 +108,10 @@ WITH_LINUX_BOOTSTRAP= YES
# if no valid jdk found, set dependency # if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR) .if !defined(BOOTSTRAPJDKDIR)
BOOTSTRAPJDKDIR?= ${LOCALBASE}/diablo-jdk1.5.0 BOOTSTRAPJDKDIR?= ${LOCALBASE}/diablo-jdk1.6.0
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk16
.endif .endif
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk15
.if !defined(WITHOUT_WEB) .if !defined(WITHOUT_WEB)
USE_GNOME= desktopfileutils USE_GNOME= desktopfileutils
.endif .endif
@ -120,8 +120,8 @@ ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= YES USE_GMAKE= YES
USE_ICONV= YES USE_ICONV= YES
USE_XORG+= x11 xext xi xtst USE_XORG+= x11 xext xi xtst
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" RESTRICTED= Redistribution of pre-compiled binaries is not permitted
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= Redistribution of pre-compiled binaries is not permitted
MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \ MAKE_ENV+= ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
ALT_MOTIF_DIR="${LOCALBASE}" \ ALT_MOTIF_DIR="${LOCALBASE}" \
@ -191,46 +191,45 @@ DESKTOP_FILES= ../../deploy/src/desktop/freedesktop/applications/sun-java.deskto
# Check for JDK sources and patch file # Check for JDK sources and patch file
.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{ .if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
ECHO_MSG=/usr/bin/printf DISTFILE_INSTRUCTIONS=\n\
IGNORE= :\n\
Due to licensing restrictions, certain files must be fetched manually.\n\n Due to licensing restrictions, certain files must be fetched manually.\n\n
.if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE})#{ .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE})#{
IGNORE += Please open http://download.java.net/jdk6/6u${JDK_UPDATE_VERSION}/promoted/b${JDK_BUILD_NUMBER}/index.html\n\ DISTFILE_INSTRUCTIONS += Please open http://download.java.net/jdk6/6u${JDK_UPDATE_VERSION}/promoted/b${JDK_BUILD_NUMBER}/index.html\n\
in a web browser. Download the\n in a web browser. Download the\n
.if !exists(${DISTDIR}/${JRL_SRCFILE})#{ .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
IGNORE += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE} DISTFILE_INSTRUCTIONS += Update ${JDK_UPDATE_VERSION} Source, ${JRL_SRCFILE}
.endif#} .endif#}
.if !exists(${DISTDIR}/${JRL_BINFILE})#{ .if !exists(${DISTDIR}/${JRL_BINFILE})#{
.if !exists(${DISTDIR}/${JRL_SRCFILE})#{ .if !exists(${DISTDIR}/${JRL_SRCFILE})#{
IGNORE += and the\n DISTFILE_INSTRUCTIONS += and the\n
.endif#} .endif#}
IGNORE += Source Binaries, ${JRL_BINFILE} DISTFILE_INSTRUCTIONS += Source Binaries, ${JRL_BINFILE}
.endif#} .endif#}
.if !exists(${DISTDIR}/${JRL_MOZFILE})#{ .if !exists(${DISTDIR}/${JRL_MOZFILE})#{
.if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{ .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE})#{
IGNORE += and the\n DISTFILE_INSTRUCTIONS += and the\n
.endif#} .endif#}
IGNORE += Mozilla Headers, ${JRL_MOZFILE} DISTFILE_INSTRUCTIONS += Mozilla Headers, ${JRL_MOZFILE}
.endif#} .endif#}
IGNORE += .\n\n DISTFILE_INSTRUCTIONS += .\n\n
.endif#} .endif#}
.if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{ .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\ DISTFILE_INSTRUCTIONS += Please open http://java.sun.com/javase/downloads/index.jsp\n\
in a web browser and follow the \"Download\" link for\n\ in a web browser and follow the \"Download\" link for\n\
\"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n \"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
.endif#} .endif#}
.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{ .if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\ DISTFILE_INSTRUCTIONS += Please open http://java.sun.com/javase/downloads/index.jsp\n\
in a web browser and follow the \"Download\" link for\n\ in a web browser and follow the \"Download\" link for\n\
\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\ \"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
time zone update file, ${TZUPDATEFILE}.\n\n time zone update file, ${TZUPDATEFILE}.\n\n
.endif#} .endif#}
.if !exists(${DISTDIR}/${PATCHSETFILE})#{ .if !exists(${DISTDIR}/${PATCHSETFILE})#{
IGNORE += Please download the patchset, ${PATCHSETFILE}, from\n\ DISTFILE_INSTRUCTIONS += Please download the patchset, ${PATCHSETFILE}, from\n\
http://www.eyesbeyond.com/freebsddom/java/jdk16.html.\n\n http://www.eyesbeyond.com/freebsddom/java/jdk16.html.\n\n
.endif#} .endif#}
IGNORE += Please place the downloaded file(s) in ${DISTDIR} DISTFILE_INSTRUCTIONS += Please place the downloaded file(s) in ${DISTDIR}
IGNORE += \n and restart the build.\n\n DISTFILE_INSTRUCTIONS += \n and restart the build.\n\n
.endif#} .endif#}
pre-fetch: pre-fetch:
@ -244,6 +243,10 @@ pre-fetch:
@${ECHO_MSG} "mounted." @${ECHO_MSG} "mounted."
@${ECHO_MSG} @${ECHO_MSG}
.endif .endif
.if defined(DISTFILE_INSTRUCTIONS)
@${PRINTF} "${DISTFILE_INSTRUCTIONS}"
@exit 1
.endif
# Get JRL agreement # Get JRL agreement
.if !defined(PACKAGE_BUILDING) .if !defined(PACKAGE_BUILDING)
@ -302,24 +305,24 @@ post-patch:
pre-build: pre-build:
@if [ "$${WRKDIRPREFIX}" -a \ @if [ "$${WRKDIRPREFIX}" -a \
-L "/compat/linux/$${WRKDIRPREFIX}" -a \ -L "/compat/linux/$${WRKDIRPREFIX}" -a \
x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | awk '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \ x`${LS} -ld "/compat/linux/$${WRKDIRPREFIX}" 2>/dev/null | ${AWK} '/->/{print $$NF;exit 0}END{exit 1}'` = x"$${WRKDIRPREFIX}" ]; \
then \ then \
${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \ ${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \
${ECHO_MSG} "have a matching symbolic link in /compat/linux."; \ ${ECHO_MSG} "have a matching symbolic link in /compat/linux."; \
${ECHO_MSG} "This is known to cause problems during bootstrapping."; \ ${ECHO_MSG} "This is known to cause problems during bootstrapping."; \
exit 1; \ exit 1; \
fi fi
@if [ `/sbin/sysctl -n compat.linux.osname` != "Linux" ]; \ @if [ `${SYSCTL} -n compat.linux.osname` != "Linux" ]; \
then \ then \
${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \ ${ECHO_MSG} "Please set the value of the sysctl compat.linux.osname"; \
${ECHO_MSG} "to 'Linux' with the command:"; \ ${ECHO_MSG} "to 'Linux' with the command:"; \
${ECHO_MSG} " /sbin/sysctl compat.linux.osname=Linux"; \ ${ECHO_MSG} " ${SYSCTL} compat.linux.osname=Linux"; \
${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \ ${ECHO_MSG} "Having it set to other values, such as 'FreeBSD',"; \
${ECHO_MSG} "is known to cause problems during bootstrapping."; \ ${ECHO_MSG} "is known to cause problems during bootstrapping."; \
exit 1; \ exit 1; \
fi fi
.if !defined(WITH_JAIL)#{ .if !defined(WITH_JAIL)#{
@if [ "`/sbin/mount | grep ^linprocfs`" = "" ]; \ @if [ "`/sbin/mount | ${GREP} ^linprocfs`" = "" ]; \
then \ then \
${ECHO_MSG} "ERROR: You must have LINPROCFS mounted before" ; \ ${ECHO_MSG} "ERROR: You must have LINPROCFS mounted before" ; \
${ECHO_MSG} "starting to build the native JDK 1.6.0." ; \ ${ECHO_MSG} "starting to build the native JDK 1.6.0." ; \