Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

openssl: fix compilation issues on SmartOS x64

the SunOS linker is more strict than usual, so we have to be more
correct.
  • Loading branch information...
commit 144dd3159baf889334030ea0c12fb449db164d3a 1 parent c369001
Bert Belder authored

Showing 1 changed file with 14 additions and 8 deletions. Show diff stats Hide diff stats

  1. 22  deps/openssl/openssl.gyp
22  deps/openssl/openssl.gyp
@@ -540,7 +540,6 @@
540 540
         'openssl/crypto/ui/ui_openssl.c',
541 541
         'openssl/crypto/ui/ui_util.c',
542 542
         'openssl/crypto/uid.c',
543  
-        'openssl/crypto/whrlpool/wp_block.c',
544 543
         'openssl/crypto/whrlpool/wp_dgst.c',
545 544
         'openssl/crypto/x509/by_dir.c',
546 545
         'openssl/crypto/x509/by_file.c',
@@ -629,7 +628,8 @@
629 628
             'openssl/crypto/des/fcrypt_b.c',
630 629
             'openssl/crypto/mem_clr.c',
631 630
             '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'
633 633
           ]
634 634
         }, {
635 635
           # Enable asm
@@ -666,7 +666,8 @@
666 666
                 'asm/x86-elf-gas/sha/sha256-586.s',
667 667
                 'asm/x86-elf-gas/sha/sha512-586.s',
668 668
                 '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'
670 671
               ]
671 672
             }],
672 673
             ['OS!="win" and OS!="mac" and target_arch=="x64"', {
@@ -685,7 +686,8 @@
685 686
                 # No asm available
686 687
                 'openssl/crypto/cast/c_enc.c',
687 688
                 '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'
689 691
               ]
690 692
             }],
691 693
             ['OS=="mac" and target_arch=="ia32"', {
@@ -706,7 +708,8 @@
706 708
                 'asm/x86-macosx-gas/sha/sha256-586.s',
707 709
                 'asm/x86-macosx-gas/sha/sha512-586.s',
708 710
                 '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'
710 713
               ]
711 714
             }],
712 715
             ['OS=="mac" and target_arch=="x64"', {
@@ -725,7 +728,8 @@
725 728
                 # No asm available
726 729
                 'openssl/crypto/cast/c_enc.c',
727 730
                 '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'
729 733
               ]
730 734
             }],
731 735
             ['OS=="win" and target_arch=="ia32"', {
@@ -746,7 +750,8 @@
746 750
                 'asm/x86-win32-masm/sha/sha256-586.asm',
747 751
                 'asm/x86-win32-masm/sha/sha512-586.asm',
748 752
                 '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'
750 755
               ],
751 756
               'rules': [
752 757
                 {
@@ -783,7 +788,8 @@
783 788
                 # No asm available
784 789
                 'openssl/crypto/cast/c_enc.c',
785 790
                 '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'
787 793
               ],
788 794
               'rules': [
789 795
                 {

0 notes on commit 144dd31

Please sign in to comment.
Something went wrong with that request. Please try again.