RFR: JDK-8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION (original) (raw)
Magnus Ihse Bursie magnus.ihse.bursie at oracle.com
Thu Mar 16 10:40:54 UTC 2017
- Previous message (by thread): RFR: JDK-8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
- Next message (by thread): 8174823: Module system implementation refresh (3/2017)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Looks good to me.
/Magnus
On 2017-03-16 10:07, Erik Joelsson wrote:
When building OpenJDK source after converting it to a different license, the build fails because the file ASSEMBLYEXCEPTION is missing. This change makes the build skip including top level license files if they don't exist.
Bug: https://bugs.openjdk.java.net/browse/JDK-8176849 Patch: diff -r 5548e024cbcf make/copy/Copy-java.base.gmk --- a/make/copy/Copy-java.base.gmk +++ b/make/copy/Copy-java.base.gmk @@ -235,8 +235,10 @@ # JDK license and assembly exception files to be packaged in JMOD -JDKLICENSE ?= $(TOPDIR)/LICENSE -JDKNOTICE ?= $(TOPDIR)/ASSEMBLYEXCEPTION +# The license files may not be present if the source has been obtained using a +# different license. +JDKLICENSE ?= (wildcard(wildcard (wildcard(TOPDIR)/LICENSE) +JDKNOTICE ?= (wildcard(wildcard (wildcard(TOPDIR)/ASSEMBLYEXCEPTION) _$(eval $(call SetupCopyFiles, COPYJDKNOTICES, _ _FILES := (JDKLICENSE)(JDKLICENSE) (JDKLICENSE)(JDKNOTICE), _
- Previous message (by thread): RFR: JDK-8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
- Next message (by thread): 8174823: Module system implementation refresh (3/2017)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]