(urgent) RFR: JDK-8201222: JDK-8199539 broke the OpenJDK build (original) (raw)

Tim Bell tim.bell at oracle.com
Fri Apr 6 01🔞28 UTC 2018

Erik:

The fix in JDK-8199539 works fine for OracleJDK builds but broke the OpenJDK build. The problem is that I used CUSTOMROOT as the SRC dir for SetupCopyFiles. This was a bit of a hack together with FLATTEN := true. The idea was that I didn't care about the source dir but just wanted each file listed copied into the dest dir. CUSTOMROOT is however only defined in the OracleJDK build so won't work in an open only build. I've reworked this to instead loop over the files and call SetupCopyFiles once for each file to be copied instead.

Bug: https://bugs.openjdk.java.net/browse/JDK-8201222 Patch: diff -r 149dc554808c make/copy/CopyCommon.gmk --- a/make/copy/CopyCommon.gmk +++ b/make/copy/CopyCommon.gmk @@ -73,11 +73,12 @@ # EXCLUDES : List of filenames to exclude from copy SetupCopyLegalFiles = $(NamedParamsMacroTemplate) define SetupCopyLegalFilesBody _- (eval (call SetupCopyFiles, $1, _ _- SRC := (CUSTOMROOT), _ _- DEST := (LEGALDSTDIR), _ _- FILES := (filter-out (addprefix %/, ($1EXCLUDES)), _ - (wildcard (addsuffix /*, (call FindModuleLegalSrcDirs, _$$(MODULE))))), _ _- FLATTEN := true, _ - )) _+ (foreach f, (filter-out (addprefix %/, ($1EXCLUDES)), _ + (wildcard (addsuffix /*, (call FindModuleLegalSrcDirs, _$$(MODULE))))), _ _+ (eval (call SetupCopyFiles, 111$(notdir f), _ _+ DEST := (LEGALDSTDIR), _ _+ FILES := f, _ _+ )) _ _+ (eval 1+=1 += 1+=$($1$$(notdir f))) _ + ) endef

Looks good.

Tim

More information about the build-dev mailing list