diff options
| author | sebmarchand <sebmarchand@chromium.org> | 2014-11-26 12:34:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-26 20:35:22 +0000 |
| commit | d6dc32712273697cabc01d3be99ae5a5442b4a72 (patch) | |
| tree | 7ddad481fb715e55dfb1395b8ce116c60f25a95f /third_party/yasm | |
| parent | 4fde5f44394d47233ed80de93c3f82d11530586d (diff) | |
| download | chromium_src-d6dc32712273697cabc01d3be99ae5a5442b4a72.zip chromium_src-d6dc32712273697cabc01d3be99ae5a5442b4a72.tar.gz chromium_src-d6dc32712273697cabc01d3be99ae5a5442b4a72.tar.bz2 | |
Remove a reference to __DATE__ from yasm for non official builds.
R=maruel@chromium.org
TBR=hclam@chromium.org
BUG=
Review URL: https://codereview.chromium.org/759653005
Cr-Commit-Position: refs/heads/master@{#305876}
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/CHROMIUM.diff | 24 | ||||
| -rw-r--r-- | third_party/yasm/README.chromium | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/third_party/yasm/CHROMIUM.diff b/third_party/yasm/CHROMIUM.diff new file mode 100644 index 0000000..764cbf7 --- /dev/null +++ b/third_party/yasm/CHROMIUM.diff @@ -0,0 +1,24 @@ +--- frontends/tasm/tasm.c ++++ frontends/tasm/tasm.c +@@ -224,7 +224,9 @@ + /* version message */ + /*@observer@*/ static const char *version_msg[] = { + PACKAGE_STRING, ++#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD) + "Compiled on " __DATE__ ".", ++#endif + "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.", + "Run yasm --license for licensing overview and summary." + }; +--- frontends/yasm/yasm.c ++++ frontends/yasm/yasm.c +@@ -213,7 +213,9 @@ + /* version message */ + /*@observer@*/ static const char *version_msg[] = { + PACKAGE_STRING, ++#if !defined(DONT_EMBED_BUILD_METADATA) || defined(OFFICIAL_BUILD) + "Compiled on " __DATE__ ".", ++#endif + "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 56513f7..7006a63 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -13,6 +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 See also the yasm.gyp file for a description of the yasm build process. |