瀏覽代碼

makewheel: Make sure everything has an ad-hoc code signature

Fixes #927
rdb 4 年之前
父節點
當前提交
915e079596
共有 1 個文件被更改,包括 3 次插入13 次删除
  1. 3 13
      makepanda/makewheel.py

+ 3 - 13
makepanda/makewheel.py

@@ -404,12 +404,10 @@ class WheelFile(object):
 
             # Now add dependencies.  On macOS, fix @loader_path references.
             if sys.platform == "darwin":
-                is_unsigned = subprocess.call(['codesign', '-d', temp.name], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                 if source_path.endswith('deploy-stubw'):
                     deps_path = '@executable_path/../Frameworks'
                 else:
                     deps_path = '@loader_path'
-                remove_signature = False
                 loader_path = [os.path.dirname(source_path)]
                 for dep in deps:
                     if dep.endswith('/Python'):
@@ -451,17 +449,9 @@ class WheelFile(object):
                         continue
 
                     subprocess.call(["install_name_tool", "-change", dep, new_dep, temp.name])
-                    remove_signature = True
-
-                # Replace the codesign signature if we modified the library.
-                if self.platform.endswith("_arm64") and (is_unsigned or remove_signature):
-                    subprocess.call(["codesign", "-f", "-s", "-", temp.name])
-                elif remove_signature and not is_unsigned:
-                    if GetVerbose():
-                        print("Removing code signature from {0}".format(source_path))
-                    subprocess.call(["codesign", "--remove-signature", temp.name])
-                    if self.platform.endswith("_universal2"):
-                        subprocess.call(["codesign", "-a", "arm64", "-s", "-", temp.name])
+
+                # Make sure it has an ad-hoc code signature.
+                subprocess.call(["codesign", "-f", "-s", "-", temp.name])
             else:
                 # On other unixes, we just add dependencies normally.
                 for dep in deps: