Page MenuHomeFreeBSD
Files F136665402

D53782.diff
No OneTemporary
Actions

D53782.diff
View Options

diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk
--- a/Mk/Uses/java.mk
+++ b/Mk/Uses/java.mk
@@ -18,6 +18,8 @@
#
# extract - Add the JDK port to the extract dependencies
#
+# headless - Use the headless flavor JDK
+#
# run - Add the JDK port to the run dependencies
#
# For FreeBSD committers:
@@ -122,7 +124,7 @@
_INCLUDE_USES_JAVA_MK= yes
-_JAVA_VALID_ARGS= ant build extract run
+_JAVA_VALID_ARGS= ant build extract headless run
_JAVA_UNKNOWN_ARGS=
. for arg in ${java_ARGS}
. if empty(_JAVA_VALID_ARGS:M${arg})
@@ -144,6 +146,7 @@
.undef _USE_JAVA_ANT
.undef _USE_JAVA_BUILD
.undef _USE_JAVA_EXTRACT
+.undef _USE_JAVA_HEADLESS
.undef _USE_JAVA_RUN
_JAVA_ARGS= ${java_ARGS:S/,/ /g}
. if ${_JAVA_ARGS:Mextract}
@@ -171,6 +174,10 @@
_USE_JAVA_RUN= yes
_JAVA_ARGS:= ${_JAVA_ARGS:Nrun}
. endif
+. if ${_JAVA_ARGS:Mheadless}
+_USE_JAVA_HEADLESS= yes
+_JAVA_ARGS:= ${_JAVA_ARGS:Nheadless}
+. endif
. endif # !empty(java_ARGS)
#-------------------------------------------------------------------------------
@@ -396,6 +403,9 @@
_JAVA_PORT_INFO:= ${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/}
JAVA_PORT= ${_JAVA_PORT_INFO:MPORT=*:S,PORT=,,}
JAVA_HOME= ${_JAVA_PORT_INFO:MHOME=*:S,HOME=,,}
+.gcc if defined(_USE_JAVA_HEADLESS)
+JAVA_HOME:= ${JAVA_HOME}-headless
+.endif
JAVA_PORT_VERSION= ${_JAVA_PORT_INFO:MVERSION=*:S,VERSION=,,}
JAVA_PORT_OS= ${_JAVA_PORT_INFO:MOS=*:S,OS=,,}
JAVA_PORT_VENDOR= ${_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,}
@@ -409,36 +419,36 @@
# Add the JDK port to the dependencies
DEPEND_JAVA= ${JAVA}:${JAVA_PORT}
-. if defined(_USE_JAVA_EXTRACT)
+.if defined(_USE_JAVA_EXTRACT)
EXTRACT_DEPENDS+= ${DEPEND_JAVA}
-. endif
-. if defined(_USE_JAVA_BUILD)
+.endif
+.if defined(_USE_JAVA_BUILD)
BUILD_DEPENDS+= ${DEPEND_JAVA}
-. endif
-. if defined(_USE_JAVA_RUN)
+.endif
+.if defined(_USE_JAVA_RUN)
RUN_DEPENDS+= ${DEPEND_JAVA}
-. endif
+.endif
# Ant support: default do-build target
-. if defined(_USE_JAVA_ANT)
+.if defined(_USE_JAVA_ANT)
DESTDIRNAME= -Dfreebsd.ports.destdir
ANT?= ${LOCALBASE}/bin/ant
MAKE_ENV+= JAVA_HOME=${JAVA_HOME}
BUILD_DEPENDS+= ${ANT}:devel/apache-ant
ALL_TARGET?=
-. if !target(do-build)
+. if !target(do-build)
do-build:
@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
${ANT} ${MAKE_ARGS} ${ALL_TARGET})
-. endif
-. if !target(do-test) && defined(TEST_TARGET)
+. endif
+. if !target(do-test) && defined(TEST_TARGET)
TEST_DEPENDS+= ${DEPEND_JAVA}
TEST_DEPENDS+= ${ANT}:devel/apache-ant
do-test:
@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
${ANT} ${MAKE_ARGS} ${TEST_TARGET})
-. endif
. endif
+.endif
#-----------------------------------------------------------------------------
# Stage 5: Define all settings for the port to use
@@ -451,9 +461,9 @@
#. undef JAVAC
# Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
-. if defined(_USE_JAVA_BUILD) && !defined(JAVAC)
+.if defined(_USE_JAVA_BUILD) && !defined(JAVAC)
JAVAC?= ${JAVA_HOME}/bin/javac
-. endif
+.endif
# Define the location of some more executables.
APPLETVIEWER?= ${JAVA_HOME}/bin/appletviewer

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 7:40 PM (9 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25413868
Default Alt Text
D53782.diff (3 KB)

Event Timeline