summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-05-14 10:24:50 +0100
committerTorne (Richard Coles) <torne@google.com>2014-05-14 10:24:50 +0100
commit945bc2ac9a955be1b128506049dd828b217da739 (patch)
treef8238bbaebff9aea1e5029219a597428812d0765
parentaefa5915b1afd972a37fc1aee03c95a989fef6e4 (diff)
downloadopenssl-945bc2ac9a955be1b128506049dd828b217da739.tar.gz
Update makefiles after merge of Chromium at 269467
This commit was generated by merge_from_chromium.py. Change-Id: Ie657c929ded471c277913dae134d308c174d0e63
-rw-r--r--openssl.target.darwin-arm.mk2
-rw-r--r--openssl.target.darwin-arm64.mk2
-rw-r--r--openssl.target.darwin-mips.mk2
-rw-r--r--openssl.target.darwin-x86.mk2
-rw-r--r--openssl.target.darwin-x86_64.mk2
-rw-r--r--openssl.target.linux-arm.mk2
-rw-r--r--openssl.target.linux-arm64.mk2
-rw-r--r--openssl.target.linux-mips.mk2
-rw-r--r--openssl.target.linux-x86.mk2
-rw-r--r--openssl.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index b44c4a8..f1ebd9c 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -640,6 +640,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -743,6 +744,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index ca8aefa..093bfc9 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -628,6 +628,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -721,6 +722,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 55a213f..52b0be8 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -635,6 +635,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -736,6 +737,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 93bc202..5ebaa58 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -641,6 +641,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -750,6 +751,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index 07bd9e3..cf24e4b 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -644,6 +644,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -753,6 +754,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index b44c4a8..f1ebd9c 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -640,6 +640,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -743,6 +744,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk
index ca8aefa..093bfc9 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -628,6 +628,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -721,6 +722,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 55a213f..52b0be8 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -635,6 +635,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -736,6 +737,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 93bc202..5ebaa58 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -641,6 +641,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -750,6 +751,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk
index 07bd9e3..cf24e4b 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -644,6 +644,7 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \
@@ -753,6 +754,7 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DNO_WINDOWS_BRAINDEATH' \
'-DPURIFY' \
'-DMONOLITH' \