summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
authormaruel <maruel@chromium.org>2016-02-08 13:17:43 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-08 21:19:15 +0000
commit77e1d01e1d15ebe163796d7742f177df24b1f089 (patch)
tree367a9791e426b6e71533358131883c2664a4c8e1 /third_party/yasm
parent9d7e229d3ab4770c6d1692ba15a2d73fde0ca4d8 (diff)
downloadchromium_src-77e1d01e1d15ebe163796d7742f177df24b1f089.zip
chromium_src-77e1d01e1d15ebe163796d7742f177df24b1f089.tar.gz
chromium_src-77e1d01e1d15ebe163796d7742f177df24b1f089.tar.bz2
Roll patched-yasm to remove the __DATE__ reference.
R=dalecurtis@chromium.org BUG=314403 Review URL: https://codereview.chromium.org/1680753003 Cr-Commit-Position: refs/heads/master@{#374176}
Diffstat (limited to 'third_party/yasm')
-rw-r--r--third_party/yasm/CHROMIUM.diff8
-rw-r--r--third_party/yasm/README.chromium2
2 files changed, 3 insertions, 7 deletions
diff --git a/third_party/yasm/CHROMIUM.diff b/third_party/yasm/CHROMIUM.diff
index 764cbf7..80fd767 100644
--- a/third_party/yasm/CHROMIUM.diff
+++ b/third_party/yasm/CHROMIUM.diff
@@ -4,9 +4,7 @@
/* version message */
/*@observer@*/ static const char *version_msg[] = {
PACKAGE_STRING,
-+#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD)
- "Compiled on " __DATE__ ".",
-+#endif
+- "Compiled on " __DATE__ ".",
"Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
"Run yasm --license for licensing overview and summary."
};
@@ -16,9 +14,7 @@
/* version message */
/*@observer@*/ static const char *version_msg[] = {
PACKAGE_STRING,
-+#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD)
- "Compiled on " __DATE__ ".",
-+#endif
+- "Compiled on " __DATE__ ".",
"Copyright (c) 2001-2011 Peter Johnson and other Yasm developers.",
"Run yasm --license for licensing overview and summary."
};
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium
index 7006a63..81b286f 100644
--- a/third_party/yasm/README.chromium
+++ b/third_party/yasm/README.chromium
@@ -13,7 +13,7 @@ With these patches merged:
* https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e
* https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36
* https://github.com/yasm/yasm/commit/9728322335cba96500861ef766b1546d096e5600
-* CHROMIUM.diff
+* CHROMIUM.diff: this patch makes yasm deterministic.
See also the yasm.gyp file for a description of the yasm build process.