Skip to content

Commit d05d6a3

Browse files
piscisaureusisaacs
authored andcommitted
openssl: fix compilation issues on SmartOS x64
the SunOS linker is more strict than usual, so we have to be more correct.
1 parent ea2ceb7 commit d05d6a3

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

deps/openssl/openssl.gyp

+14-8
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@
540540
'openssl/crypto/ui/ui_openssl.c',
541541
'openssl/crypto/ui/ui_util.c',
542542
'openssl/crypto/uid.c',
543-
'openssl/crypto/whrlpool/wp_block.c',
544543
'openssl/crypto/whrlpool/wp_dgst.c',
545544
'openssl/crypto/x509/by_dir.c',
546545
'openssl/crypto/x509/by_file.c',
@@ -629,7 +628,8 @@
629628
'openssl/crypto/des/fcrypt_b.c',
630629
'openssl/crypto/mem_clr.c',
631630
'openssl/crypto/rc4/rc4_enc.c',
632-
'openssl/crypto/rc4/rc4_skey.c'
631+
'openssl/crypto/rc4/rc4_skey.c',
632+
'openssl/crypto/whrlpool/wp_block.c'
633633
]
634634
}, {
635635
# Enable asm
@@ -666,7 +666,8 @@
666666
'asm/x86-elf-gas/sha/sha256-586.s',
667667
'asm/x86-elf-gas/sha/sha512-586.s',
668668
'asm/x86-elf-gas/whrlpool/wp-mmx.s',
669-
'asm/x86-elf-gas/x86cpuid.s'
669+
'asm/x86-elf-gas/x86cpuid.s',
670+
'openssl/crypto/whrlpool/wp_block.c'
670671
]
671672
}],
672673
['OS!="win" and OS!="mac" and target_arch=="x64"', {
@@ -685,7 +686,8 @@
685686
# No asm available
686687
'openssl/crypto/cast/c_enc.c',
687688
'openssl/crypto/des/des_enc.c',
688-
'openssl/crypto/bf/bf_enc.c'
689+
'openssl/crypto/bf/bf_enc.c',
690+
'openssl/crypto/des/fcrypt_b.c'
689691
]
690692
}],
691693
['OS=="mac" and target_arch=="ia32"', {
@@ -706,7 +708,8 @@
706708
'asm/x86-macosx-gas/sha/sha256-586.s',
707709
'asm/x86-macosx-gas/sha/sha512-586.s',
708710
'asm/x86-macosx-gas/whrlpool/wp-mmx.s',
709-
'asm/x86-macosx-gas/x86cpuid.s'
711+
'asm/x86-macosx-gas/x86cpuid.s',
712+
'openssl/crypto/whrlpool/wp_block.c'
710713
]
711714
}],
712715
['OS=="mac" and target_arch=="x64"', {
@@ -725,7 +728,8 @@
725728
# No asm available
726729
'openssl/crypto/cast/c_enc.c',
727730
'openssl/crypto/des/des_enc.c',
728-
'openssl/crypto/bf/bf_enc.c'
731+
'openssl/crypto/bf/bf_enc.c',
732+
'openssl/crypto/des/fcrypt_b.c'
729733
]
730734
}],
731735
['OS=="win" and target_arch=="ia32"', {
@@ -746,7 +750,8 @@
746750
'asm/x86-win32-masm/sha/sha256-586.asm',
747751
'asm/x86-win32-masm/sha/sha512-586.asm',
748752
'asm/x86-win32-masm/whrlpool/wp-mmx.asm',
749-
'asm/x86-win32-masm/x86cpuid.asm'
753+
'asm/x86-win32-masm/x86cpuid.asm',
754+
'openssl/crypto/whrlpool/wp_block.c'
750755
],
751756
'rules': [
752757
{
@@ -783,7 +788,8 @@
783788
# No asm available
784789
'openssl/crypto/cast/c_enc.c',
785790
'openssl/crypto/des/des_enc.c',
786-
'openssl/crypto/bf/bf_enc.c'
791+
'openssl/crypto/bf/bf_enc.c',
792+
'openssl/crypto/des/fcrypt_b.c'
787793
],
788794
'rules': [
789795
{

0 commit comments

Comments
 (0)