diff options
Diffstat (limited to 'chromium/third_party/openssl/import_from_android.sh')
| -rwxr-xr-x | chromium/third_party/openssl/import_from_android.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/third_party/openssl/import_from_android.sh b/chromium/third_party/openssl/import_from_android.sh index ea1ab195cd6..60420d841d4 100755 --- a/chromium/third_party/openssl/import_from_android.sh +++ b/chromium/third_party/openssl/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 "{" @@ -456,12 +456,23 @@ generate_gyp_file () { dump "Generating 64-bit configuration header file." mkdir -p $PROGDIR/config/x64/openssl/ sed \ + -e 's|^#define RC4_INT unsigned char|#define RC4_INT unsigned int|g' \ -e 's|^#define BN_LLONG|#undef BN_LLONG|g' \ -e 's|^#define THIRTY_TWO_BIT|#undef THIRTY_TWO_BIT|g' \ -e 's|^#undef SIXTY_FOUR_BIT_LONG|#define SIXTY_FOUR_BIT_LONG|g' \ + -e 's|^#define BF_PTR|#undef BF_PTR|g' \ $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 |