svn commit: r457243 - head/java/openjdk8
Tijl Coosemans
tijl at FreeBSD.org
Mon Dec 25 17:35:41 UTC 2017
Author: tijl
Date: Mon Dec 25 17:35:39 2017
New Revision: 457243
URL: https://svnweb.freebsd.org/changeset/ports/457243
Log:
Replace USE_AUTOTOOLS and pre-configure with a plain build dependency on
devel/autoconf. The upstream build system runs autoconf to regenerate
generated-configure.sh.
Modified:
head/java/openjdk8/Makefile
Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile Mon Dec 25 17:05:22 2017 (r457242)
+++ head/java/openjdk8/Makefile Mon Dec 25 17:35:39 2017 (r457243)
@@ -39,6 +39,7 @@ COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
LICENSE= GPLv2
BUILD_DEPENDS= zip:archivers/zip \
+ autoconf>0:devel/autoconf \
${LOCALBASE}/include/cups/cups.h:print/cups \
bash:shells/bash
LIB_DEPENDS= libfreetype.so:print/freetype2
@@ -47,7 +48,6 @@ RUN_DEPENDS= javavm:java/javavmwrapper \
USES= compiler:features dos2unix gmake iconv pkgconfig \
shebangfix
-USE_AUTOTOOLS= autoconf
.if !exists(/usr/bin/unzip)
BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip
@@ -211,6 +211,7 @@ JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
JTREG_JENKINS_BUILD= 77
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR}
CONFIGURE_ARGS+= --with-build-number="b${JDK_BUILD_NUMBER}"
.if ${JDK_UPDATE_VERSION} > 0
@@ -293,8 +294,6 @@ JAVAVMS_COMMENT+= JRE
JDK_BUILD_TYPE= release
.endif
-AUTOCONF_ARGS= -I . -o generated-configure.sh generated-configure.ac
-
# XXX configure script rejects CC/CPP/CXX with absolute paths.
.for t in CC CPP CXX
.if defined(${t}) && ${${t}:M/*}
@@ -410,11 +409,6 @@ post-patch:
post-patch-ALSA-off:
@${REINPLACE_CMD} '/EXTRA_SOUND_JNI_LIBS += jsoundalsa/d' \
${WRKSRC}/jdk/make/lib/SoundLibraries.gmk
-
-pre-configure:
- @cd ${CONFIGURE_WRKSRC} && \
- ${SED} -e "s|@DATE_WHEN_GENERATED@|$$(date +%s)|" configure.ac > \
- generated-configure.ac
post-build:
.if !defined(BUILD_JRE)
More information about the svn-ports-all
mailing list