mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-18 22:35:39 +01:00
depends: mac deploy Py3 compatibility
This fixes the gitian MacOSX build, it was broken in #7723. The patch to `native_mac_alias` should probably make it upstream.
This commit is contained in:
committed by
Cory Fields
parent
59ad56851a
commit
a6666b25c7
@@ -210,8 +210,8 @@ def getFrameworks(binaryPath, verbose):
|
||||
sys.stderr.write(o_stderr)
|
||||
sys.stderr.flush()
|
||||
raise RuntimeError("otool failed with return code %d" % otool.returncode)
|
||||
|
||||
otoolLines = o_stdout.split("\n")
|
||||
|
||||
otoolLines = o_stdout.decode().split("\n")
|
||||
otoolLines.pop(0) # First line is the inspected binary
|
||||
if ".framework" in binaryPath or binaryPath.endswith(".dylib"):
|
||||
otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency.
|
||||
@@ -676,7 +676,7 @@ if verbose >= 2:
|
||||
print("+ Installing qt.conf +")
|
||||
|
||||
f = open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb")
|
||||
f.write(qt_conf)
|
||||
f.write(qt_conf.encode())
|
||||
f.close()
|
||||
|
||||
# ------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user