bug 1315263 - Add a way to skip shlibsign in gyp build. r=franziskus

--HG-- extra : rebase_source : 952c9a033bbb3d28055bbfcae3a4d18609ab2371
sailfishos-mirror · Nov 4, 2016 · d2365cd · d2365cd
1 parent 579df04
commit d2365cd
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 32 deletions.
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
@@ -96,6 +96,7 @@
     'use_sancov%': 0,
     'test_build%': 0,
     'fuzz%': 0,
+    'sign_libs%': 1,
   },
   'target_defaults': {
     # Settings specific to targets should go here.

diff --git a/nss.gyp b/nss.gyp
@@ -124,38 +124,6 @@
         }],
       ],
     },
-    {
-      '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', {
@@ -231,6 +199,42 @@
         },
       ],
     }],
+    [ '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': [
         {