diff options
| author | wtc@chromium.org <wtc@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-06-01 01:06:54 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-06-01 01:06:54 +0000 |
| commit | 39898464beeee474c11348ba7171637a4825e1a1 (patch) | |
| tree | fe833298f2e48c3b4880ae351dd748f76692b1cc /patches.chromium | |
| parent | a32986f363afaf19de1ed6957901964217a72f2f (diff) | |
| download | openssl-39898464beeee474c11348ba7171637a4825e1a1.tar.gz | |
Fix the shared_library build on Linux.
Two source files need to be excluded for x86_64 because they are
replaced by openssl/crypto/bn/asm/x86_64-gcc.c and
openssl/crypto/rc4/asm/rc4-x86_64.S.
R=yfriedman@chromium.org,digit@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/16272007
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@203545 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'patches.chromium')
| -rw-r--r-- | patches.chromium/x86_64_source_excludes.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/patches.chromium/x86_64_source_excludes.patch b/patches.chromium/x86_64_source_excludes.patch new file mode 100644 index 0000000..e9dfc78 --- /dev/null +++ b/patches.chromium/x86_64_source_excludes.patch @@ -0,0 +1,14 @@ +diff -burN android-openssl.1/openssl.config android-openssl/openssl.config +--- android-openssl.1/openssl.config 2013-03-25 11:20:39.208813510 +0100 ++++ android-openssl/openssl.config 2013-03-25 11:34:02.687462212 +0100 +@@ -865,8 +865,10 @@ + OPENSSL_CRYPTO_SOURCES_EXCLUDES_x86_64="\ + crypto/aes/aes_cbc.c \ + crypto/aes/aes_core.c \ ++crypto/bn/bn_asm.c \ + crypto/mem_clr.c \ + crypto/rc4/rc4_enc.c \ ++crypto/rc4/rc4_skey.c \ + " + + OPENSSL_SSL_INCLUDES="\ |