bug 1315263 - Add a way to skip shlibsign in gyp build. r=franziskus
authorTed Mielczarek <ted@mielczarek.org>
Fri, 04 Nov 2016 10:52:58 -0400
changeset 12850 881e0bc1e1db09db0504a20d05542dcf45a140f0
parent 12849 b494653e5be595f23348acc59cf9f90841a2c5a8
child 12851 17c389b2e4d87dfcd41c46a73c6b2131e90e75ca
push id1774
push usertmielczarek@mozilla.com
push dateMon, 14 Nov 2016 11:27:42 +0000
reviewersfranziskus
bugs1315263
bug 1315263 - Add a way to skip shlibsign in gyp build. r=franziskus
coreconf/config.gypi
nss.gyp
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -91,16 +91,17 @@
     'moz_fold_libs%': 0,
     'moz_folded_library_name%': '',
     'ssl_enable_zlib%': 1,
     'use_asan%': 0,
     'use_ubsan%': 0,
     'use_sancov%': 0,
     'test_build%': 0,
     'fuzz%': 0,
+    'sign_libs%': 1,
   },
   'target_defaults': {
     # Settings specific to targets should go here.
     # This is mostly for linking to libraries.
     'variables': {
       'mapfile%': '',
       'test_build%': 0,
     },
--- a/nss.gyp
+++ b/nss.gyp
@@ -119,48 +119,16 @@
             'cmd/signver/signver.gyp:signver',
             'cmd/smimetools/smimetools.gyp:cmsutil',
             'cmd/ssltap/ssltap.gyp:ssltap',
             'cmd/symkeyutil/symkeyutil.gyp:symkeyutil',
           ],
         }],
       ],
     },
-    {
-      'target_name': 'nss_sign_shared_libs',
-      'type': 'none',
-      'dependencies': [
-        'cmd/shlibsign/shlibsign.gyp:shlibsign',
-      ],
-      'actions': [
-        {
-          'action_name': 'shlibsign',
-          'msvs_cygwin_shell': 0,
-          'inputs': [
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)freebl3.<(dll_suffix)',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)freeblpriv3.<(dll_suffix)',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)nssdbm3.<(dll_suffix)',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)softokn3.<(dll_suffix)',
-          ],
-          'outputs': [
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)freebl3.chk',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)freeblpriv3.chk',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)nssdbm3.chk',
-            '<(nss_dist_obj_dir)/lib/<(dll_prefix)softokn3.chk'
-          ],
-          'conditions': [
-            ['OS!="linux"', {
-              'inputs/': [['exclude', 'freeblpriv']],
-              'outputs/': [['exclude', 'freeblpriv']]
-            }],
-          ],
-          'action': ['<(python)', '<(DEPTH)/coreconf/shlibsign.py', '<@(_inputs)']
-        }
-      ],
-    },
   ],
   'conditions': [
     [ 'disable_tests==0', {
       'targets': [
         {
           'target_name': 'nss_tests',
           'type': 'none',
           'dependencies': [
@@ -226,16 +194,52 @@
               'dependencies': [
                 'cmd/pkix-errcodes/pkix-errcodes.gyp:pkix-errcodes',
               ],
             }],
           ],
         },
       ],
     }],
+    [ 'sign_libs==1', {
+      'targets': [
+        {
+        'target_name': 'nss_sign_shared_libs',
+          'type': 'none',
+          'dependencies': [
+            'cmd/shlibsign/shlibsign.gyp:shlibsign',
+          ],
+          'actions': [
+            {
+          'action_name': 'shlibsign',
+              'msvs_cygwin_shell': 0,
+              'inputs': [
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)freebl3.<(dll_suffix)',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)freeblpriv3.<(dll_suffix)',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)nssdbm3.<(dll_suffix)',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)softokn3.<(dll_suffix)',
+              ],
+              'outputs': [
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)freebl3.chk',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)freeblpriv3.chk',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)nssdbm3.chk',
+                '<(nss_dist_obj_dir)/lib/<(dll_prefix)softokn3.chk'
+              ],
+              'conditions': [
+                ['OS!="linux"', {
+                  'inputs/': [['exclude', 'freeblpriv']],
+                  'outputs/': [['exclude', 'freeblpriv']]
+                }],
+              ],
+              'action': ['<(python)', '<(DEPTH)/coreconf/shlibsign.py', '<@(_inputs)']
+            }
+          ],
+        },
+      ],
+    }],
     [ 'fuzz==1', {
       'targets': [
         {
           'target_name': 'fuzz_warning',
           'type': 'none',
           'actions': [
             {
               'action_name': 'fuzz_warning',