Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: import_from_android.sh

Issue 231353003: Adds support for compiling OpenSSL on mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « config/mac/ia32/openssl/opensslconf.h ('k') | openssl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: import_from_android.sh
diff --git a/import_from_android.sh b/import_from_android.sh
index 7dbdda6527d07527404dada2fdb714e8e2fb4f26..60420d841d40badc5212c0a371d0ff9a0530ebc3 100755
--- a/import_from_android.sh
+++ b/import_from_android.sh
@@ -404,7 +404,7 @@ generate_gyp_file () {
echo "# See 'import_from_android.sh --help' for details."
local ALL_PREFIXES="OPENSSL_CRYPTO OPENSSL_SSL"
- local ALL_ARCHS="arm mips x86 x86_64"
+ local ALL_ARCHS="arm mips x86 x86_64 mac_ia32"
local PREFIX ARCH LIST
print_gyp "{"
@@ -464,6 +464,15 @@ sed \
$PROGDIR/openssl/include/openssl/opensslconf.h \
> $PROGDIR/config/x64/openssl/opensslconf.h
+dump "Generating OS X 32-bit configuration header file."
+mkdir -p $PROGDIR/config/mac/ia32/openssl/
+sed \
+ -e '4a#ifndef OPENSSL_SYSNAME_MACOSX\n# define OPENSSL_SYSNAME_MACOSX\n#endif' \
+ -e 's|^#define RC4_INT unsigned char|#define RC4_INT unsigned int|g' \
+ -e 's|^#define DES_LONG unsigned int|#define DES_LONG unsigned long|g' \
+ $PROGDIR/openssl/include/openssl/opensslconf.h \
+ > $PROGDIR/config/mac/ia32/openssl/opensslconf.h
+
dump "Generating .gypi file."
. $ANDROID_SRC_DIR/openssl.config
generate_gyp_file > $PROGDIR/openssl.gypi.new
« no previous file with comments | « config/mac/ia32/openssl/opensslconf.h ('k') | openssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698