svn commit: r451167 - head/java/openjdk8
Jung-uk Kim
jkim at FreeBSD.org
Tue Oct 3 19:53:22 UTC 2017
Author: jkim
Date: Tue Oct 3 19:53:20 2017
New Revision: 451167
URL: https://svnweb.freebsd.org/changeset/ports/451167
Log:
Clean up X11 option handling. No functional change.
Modified:
head/java/openjdk8/Makefile
Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile Tue Oct 3 19:36:39 2017 (r451166)
+++ head/java/openjdk8/Makefile Tue Oct 3 19:53:20 2017 (r451167)
@@ -40,27 +40,12 @@ BUILD_DEPENDS= zip:archivers/zip \
${LOCALBASE}/include/cups/cups.h:print/cups \
bash:shells/bash
LIB_DEPENDS= libfreetype.so:print/freetype2
-X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libgif.so:graphics/giflib
RUN_DEPENDS= javavm:java/javavmwrapper \
dejavu>0:x11-fonts/dejavu
USES= compiler:features dos2unix gmake iconv pkgconfig \
shebangfix
USE_AUTOTOOLS= autoconf
-# Even when not building with X11 support, openjdk8 requires Xrender, X11,
-# Xext, and Xt headers.
-X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
-X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
-X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
-X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt
-# Add more X11 build deps and runtime deps when X11 is enabled
-X11_LIB_DEPENDS+= libX11.so.6:x11/libX11
-X11_LIB_DEPENDS+= libXext.so.6:x11/libXext
-X11_LIB_DEPENDS+= libXi.so.6:x11/libXi
-X11_LIB_DEPENDS+= libXrender.so.1:x11/libXrender
-X11_LIB_DEPENDS+= libXt.so.6:x11-toolkits/libXt
-X11_LIB_DEPENDS+= libXtst.so.6:x11/libXtst
.if !exists(/usr/bin/unzip)
BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip
@@ -201,11 +186,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH=""
MAKE_ENV+= IGNORE_OLD_CONFIG=true
MAKE_ENV+= COMPILER_WARNINGS_FATAL="false"
-# openjdk8 normally sets X_CFLAGS in the ./configure script, but it won't do
-# that if you say --disable-headful, even though it still needs some X headers.
-# Set it here instead.
-X11_MAKE_ENV_OFF= MAKEFLAGS="X_CFLAGS=-I${LOCALBASE}/include" \
- BUILD_HEADLESS_ONLY=1
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if !defined(BUILD_JRE)
@@ -247,10 +227,6 @@ CONFIGURE_ARGS+= --disable-ccache \
--with-milestone=fcs \
--with-package-path=${LOCALBASE} \
--with-zlib=system
-X11_CONFIGURE_ON= --with-giflib=system \
- --x-libraries=${LOCALBASE}/lib \
- --x-includes=${LOCALBASE}/include
-X11_CONFIGURE_OFF= --disable-headful
CONFIGURE_SCRIPT= ../../configure
CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf
@@ -270,6 +246,20 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
FPUHACK_EXTRA_PATCHES= ${PATCHDIR}/fpuhack.patch
POLICY_CONFIGURE_ENABLE= unlimited-crypto
TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo
+X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/X11/Xlib.h:x11/libX11 \
+ ${LOCALBASE}/include/X11/extensions/Xdbe.h:x11/libXext \
+ ${LOCALBASE}/include/X11/extensions/Xrender.h:x11/libXrender \
+ ${LOCALBASE}/include/X11/Intrinsic.h:x11-toolkits/libXt
+X11_CONFIGURE_OFF= --disable-headful
+X11_CONFIGURE_ON= --with-giflib=system \
+ --x-includes=${LOCALBASE}/include \
+ --x-libraries=${LOCALBASE}/lib
+X11_LIB_DEPENDS= libgif.so:graphics/giflib \
+ libfontconfig.so:x11-fonts/fontconfig
+X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \
+ MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include"
+X11_MAKE_ENV_ON= MAKEFLAGS=""
+X11_USE= XORG=x11,xext,xi,xrender,xt,xtst
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
More information about the svn-ports-all
mailing list