Date: Tue, 27 Jun 2017 08:35:24 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444448 - head/java/openjdk8 Message-ID: <201706270835.v5R8ZOKP096540@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jun 27 08:35:24 2017 New Revision: 444448 URL: https://svnweb.freebsd.org/changeset/ports/444448 Log: Add a new ALSA default option to make it possible to disable ALSA support and build the JDK without an ALSA dependency PR: 219125 Reviewed by: jbeich Approved by: mat (mentor), java (maintainer timeout, 6+ weeks) Differential Revision: https://reviews.freebsd.org/D11331 Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Tue Jun 27 08:31:00 2017 (r444447) +++ head/java/openjdk8/Makefile Tue Jun 27 08:35:24 2017 (r444448) @@ -38,8 +38,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= zip:archivers/zip \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libfreetype.so:print/freetype2 +LIB_DEPENDS= libfreetype.so:print/freetype2 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libgif.so:graphics/giflib RUN_DEPENDS= javavm:java/javavmwrapper \ @@ -237,7 +236,6 @@ CONFIGURE_ARGS+= --with-update-version=${JDK_UPDATE_VE CONFIGURE_ARGS+= --disable-ccache \ --disable-freetype-bundling \ --disable-zip-debug-info \ - --with-alsa=${LOCALBASE} \ --with-cacerts-file=${FILESDIR}/cacerts \ --with-cups=${LOCALBASE} \ --with-debug-level=${JDK_BUILD_TYPE} \ @@ -255,9 +253,9 @@ X11_CONFIGURE_OFF= --disable-headful CONFIGURE_SCRIPT= ../../configure CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf -OPTIONS_DEFINE= POLICY TZUPDATE X11 +OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11 OPTIONS_DEFINE_armv6= FPUHACK -OPTIONS_DEFAULT= POLICY TZUPDATE X11 +OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11 OPTIONS_DEFAULT_armv6= FPUHACK FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode POLICY_DESC= Install the Unlimited Strength Policy Files @@ -280,6 +278,9 @@ DEBUGFAST_DESC= Build for debugging (with optimizatio RELEASE_DESC= Build for release (default) TEST_DESC= Run regression tests +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_CONFIGURE_ON= --with-alsa=${LOCALBASE} +ALSA_CONFIGURE_ENV_OFF= ALSA_NOT_NEEDED=yes DEBUG_VARS= JDK_BUILD_TYPE=slowdebug DEBUGFAST_VARS= JDK_BUILD_TYPE=fastdebug RELEASE_BUILD_DEPENDS_OFF= ${LOCALBASE}/bin/objcopy:devel/binutils @@ -418,6 +419,10 @@ post-patch: ${WRKSRC}/jdk/make/BuildJdk.gmk .endif @${CHMOD} 755 ${WRKSRC}/configure + +post-patch-ALSA-off: + @${REINPLACE_CMD} '/EXTRA_SOUND_JNI_LIBS += jsoundalsa/d' \ + ${WRKSRC}/jdk/make/lib/SoundLibraries.gmk pre-configure: @cd ${CONFIGURE_WRKSRC} && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706270835.v5R8ZOKP096540>