diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2017-12-25 17:35:39 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2017-12-25 17:35:39 +0000 |
| commit | 03948507f8a772d5a9f325ec379cf8c2b6d3d195 (patch) | |
| tree | 585a87d1590acec8a96ff0332448cfb3e8e2bf37 /java/openjdk8 | |
| parent | Add devel/py-vine, a promises library for Python. (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=457243
Diffstat (limited to 'java/openjdk8')
| -rw-r--r-- | java/openjdk8/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index ef8f73c67fb2..1b5f8656c4da 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -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/*} @@ -411,11 +410,6 @@ 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) @${BOOTSTRAPJDKDIR}/bin/jar cfe \ |