RFR: JDK-8167424 Stop adding missing newline to manifest files
Magnus Ihse Bursie
magnus.ihse.bursie at oracle.com
Tue Oct 11 08:52:33 UTC 2016
Due to a piece of broken internal code, a workaround was added to
JarArchive to handle misformed manifest files. The root cause have now
been fixed, and the workaround should be removed and the original code
restored.
Bug: https://bugs.openjdk.java.net/browse/JDK-8158181
Patch inline:
diff --git a/make/common/JarArchive.gmk b/make/common/JarArchive.gmk
--- a/make/common/JarArchive.gmk
+++ b/make/common/JarArchive.gmk
@@ -242,7 +242,7 @@
# potential changes.
$$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \
$$(if $$($1_MANIFEST), \
- $(SED) -e '$(DOLLAR)$(DOLLAR)a\' $$($1_MANIFEST) >
$$($1_MANIFEST_FILE) $$(NEWLINE) \
+ $(CP) $$($1_MANIFEST) $$($1_MANIFEST_FILE) $$(NEWLINE) \
, \
$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE)
$$(NEWLINE)) \
$$(if $$($1_JARMAIN), \
/Magnus
More information about the build-dev
mailing list