Skip to content

Commit 7e21044

Browse files
fanquakedongcarl
andcommitted
build: use macOS 10.14 SDK
Co-Authored-By: Carl Dong <[email protected]>
1 parent ca5055a commit 7e21044

File tree

6 files changed

+133
-106
lines changed

6 files changed

+133
-106
lines changed

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export HOST=x86_64-apple-darwin16
1010
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
11-
export OSX_SDK=10.11
11+
export OSX_SDK=10.14
1212
export RUN_UNIT_TESTS=false
1313
export RUN_FUNCTIONAL_TESTS=false
1414
export GOAL="deploy"

contrib/gitian-build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def main():
209209
args.macos = 'm' in args.os
210210

211211
# Disable for MacOS if no SDK found
212-
if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.11.sdk.tar.gz'):
212+
if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.14.sdk.tar.gz'):
213213
print('Cannot build for MacOS, SDK does not exist. Will build for other OSes')
214214
args.macos = False
215215

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ remotes:
3232
- "url": "https://github.com/bitcoin/bitcoin.git"
3333
"dir": "bitcoin"
3434
files:
35-
- "MacOSX10.11.sdk.tar.gz"
35+
- "MacOSX10.14.sdk.tar.gz"
3636
script: |
3737
set -e -o pipefail
3838
@@ -90,7 +90,7 @@ script: |
9090
BASEPREFIX="${PWD}/depends"
9191
9292
mkdir -p ${BASEPREFIX}/SDKs
93-
tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
93+
tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.14.sdk.tar.gz
9494
9595
# Build dependencies for each host
9696
for i in $HOSTS; do

contrib/macdeploy/README.md

Lines changed: 128 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,135 @@
1-
### MacDeploy ###
1+
# MacOS Deployment
22

3-
For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
3+
The `macdeployqtplus` script should not be run manually. Instead, after building as usual:
44

5-
sudo easy_install argparse
5+
```bash
6+
make deploy
7+
```
68

7-
This script should not be run manually, instead, after building as usual:
9+
During the deployment process, the disk image window will pop up briefly
10+
when the fancy settings are applied. This is normal, please do not interfere,
11+
the process will unmount the DMG and cleanup before finishing.
812

9-
make deploy
13+
When complete, it will have produced `Bitcoin-Qt.dmg`.
1014

11-
During the process, the disk image window will pop up briefly where the fancy
12-
settings are applied. This is normal, please do not interfere.
15+
## SDK Extraction
1316

14-
When finished, it will produce `Bitcoin-Qt.dmg`.
17+
`Xcode.app` is packaged in a `.xip` archive.
18+
This makes the SDK less-trivial to extract on non-macOS machines.
19+
One approach (tested on Debian Buster) is outlined below:
1520

21+
```bash
22+
23+
apt install clang cpio git liblzma-dev libxml2-dev libssl-dev make
24+
25+
git clone https://github.com/tpoechtrager/xar
26+
pushd xar/xar
27+
./configure
28+
make
29+
make install
30+
popd
31+
32+
git clone https://github.com/NiklasRosenstein/pbzx
33+
pushd pbzx
34+
clang -llzma -lxar pbzx.c -o pbzx -Wl,-rpath=/usr/local/lib
35+
popd
36+
37+
xar -xf Xcode_10.2.1.xip -C .
38+
39+
./pbzx/pbzx -n Content | cpio -i
40+
41+
find Xcode.app -type d -name MacOSX.sdk -execdir sh -c 'tar -c MacOSX.sdk/ | gzip -9n > /MacOSX10.14.sdk.tar.gz' \;
42+
```
43+
44+
on macOS the process is more straightforward:
45+
46+
```bash
47+
xip -x Xcode_10.2.1.xip
48+
tar -C Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.14.sdk.tar.gz MacOSX.sdk
49+
```
50+
51+
Our previously used macOS SDK (`MacOSX10.11.sdk`) can be extracted from
52+
[Xcode 7.3.1 dmg](https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_7.3.1/Xcode_7.3.1.dmg).
53+
The script [`extract-osx-sdk.sh`](./extract-osx-sdk.sh) automates this. First
54+
ensure the DMG file is in the current directory, and then run the script. You
55+
may wish to delete the `intermediate 5.hfs` file and `MacOSX10.11.sdk` (the
56+
directory) when you've confirmed the extraction succeeded.
57+
58+
```bash
59+
apt-get install p7zip-full sleuthkit
60+
contrib/macdeploy/extract-osx-sdk.sh
61+
rm -rf 5.hfs MacOSX10.11.sdk
62+
```
63+
64+
## Deterministic macOS DMG Notes
65+
Working macOS DMGs are created in Linux by combining a recent `clang`, the Apple
66+
`binutils` (`ld`, `ar`, etc) and DMG authoring tools.
67+
68+
Apple uses `clang` extensively for development and has upstreamed the necessary
69+
functionality so that a vanilla clang can take advantage. It supports the use of `-F`,
70+
`-target`, `-mmacosx-version-min`, and `--sysroot`, which are all necessary when
71+
building for macOS.
72+
73+
Apple's version of `binutils` (called `cctools`) contains lots of functionality missing in the
74+
FSF's `binutils`. In addition to extra linker options for frameworks and sysroots, several
75+
other tools are needed as well such as `install_name_tool`, `lipo`, and `nmedit`. These
76+
do not build under Linux, so they have been patched to do so. The work here was used as
77+
a starting point: [mingwandroid/toolchain4](https://github.com/mingwandroid/toolchain4).
78+
79+
In order to build a working toolchain, the following source packages are needed from
80+
Apple: `cctools`, `dyld`, and `ld64`.
81+
82+
These tools inject timestamps by default, which produce non-deterministic binaries. The
83+
`ZERO_AR_DATE` environment variable is used to disable that.
84+
85+
This version of `cctools` has been patched to use the current version of `clang`'s headers
86+
and its `libLTO.so` rather than those from `llvmgcc`, as it was originally done in `toolchain4`.
87+
88+
To complicate things further, all builds must target an Apple SDK. These SDKs are free to
89+
download, but not redistributable. To obtain it, register for an Apple Developer Account,
90+
then download [Xcode 10.2.1](https://download.developer.apple.com/Developer_Tools/Xcode_10.2.1/Xcode_10.2.1.xip).
91+
92+
This file is many gigabytes in size, but most (but not all) of what we need is
93+
contained only in a single directory:
94+
95+
```bash
96+
Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
97+
```
98+
99+
See the SDK Extraction notes above for how to obtain it.
100+
101+
The Gitian descriptors build 2 sets of files: Linux tools, then Apple binaries which are
102+
created using these tools. The build process has been designed to avoid including the
103+
SDK's files in Gitian's outputs. All interim tarballs are fully deterministic and may be freely
104+
redistributed.
105+
106+
`genisoimage` is used to create the initial DMG. It is not deterministic as-is, so it has been
107+
patched. A system `genisoimage` will work fine, but it will not be deterministic because
108+
the file-order will change between invocations. The patch can be seen here: [cdrkit-deterministic.patch](https://github.com/bitcoin/bitcoin/blob/master/depends/patches/native_cdrkit/cdrkit-deterministic.patch).
109+
No effort was made to fix this cleanly, so it likely leaks memory badly, however it's only used for
110+
a single invocation, so that's no real concern.
111+
112+
`genisoimage` cannot compress DMGs, so afterwards, the DMG tool from the
113+
`libdmg-hfsplus` project is used to compress it. There are several bugs in this tool and its
114+
maintainer has seemingly abandoned the project.
115+
116+
The DMG tool has the ability to create DMGs from scratch as well, but this functionality is
117+
broken. Only the compression feature is currently used. Ideally, the creation could be fixed
118+
and `genisoimage` would no longer be necessary.
119+
120+
Background images and other features can be added to DMG files by inserting a
121+
`.DS_Store` before creation. This is generated by the script `contrib/macdeploy/custom_dsstore.py`.
122+
123+
As of OS X 10.9 Mavericks, using an Apple-blessed key to sign binaries is a requirement in
124+
order to satisfy the new Gatekeeper requirements. Because this private key cannot be
125+
shared, we'll have to be a bit creative in order for the build process to remain somewhat
126+
deterministic. Here's how it works:
127+
128+
- Builders use Gitian to create an unsigned release. This outputs an unsigned DMG which
129+
users may choose to bless and run. It also outputs an unsigned app structure in the form
130+
of a tarball, which also contains all of the tools that have been previously (deterministically)
131+
built in order to create a final DMG.
132+
- The Apple keyholder uses this unsigned app to create a detached signature, using the
133+
script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs).
134+
- Builders feed the unsigned app + detached signature back into Gitian. It uses the
135+
pre-built tools to recombine the pieces into a deterministic DMG.

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OSX_MIN_VERSION=10.12
2-
OSX_SDK_VERSION=10.11
2+
OSX_SDK_VERSION=10.14
33
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
44
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK)
55
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++

doc/build-osx.md

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -113,96 +113,3 @@ tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
113113
* Tested on OS X 10.12 Sierra through macOS 10.15 Catalina on 64-bit Intel
114114
processors only.
115115
* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714).
116-
117-
## Deterministic macOS DMG Notes
118-
Working macOS DMGs are created in Linux by combining a recent `clang`, the Apple
119-
`binutils` (`ld`, `ar`, etc) and DMG authoring tools.
120-
121-
Apple uses `clang` extensively for development and has upstreamed the necessary
122-
functionality so that a vanilla clang can take advantage. It supports the use of `-F`,
123-
`-target`, `-mmacosx-version-min`, and `--sysroot`, which are all necessary when
124-
building for macOS.
125-
126-
Apple's version of `binutils` (called `cctools`) contains lots of functionality missing in the
127-
FSF's `binutils`. In addition to extra linker options for frameworks and sysroots, several
128-
other tools are needed as well such as `install_name_tool`, `lipo`, and `nmedit`. These
129-
do not build under Linux, so they have been patched to do so. The work here was used as
130-
a starting point: [mingwandroid/toolchain4](https://github.com/mingwandroid/toolchain4).
131-
132-
In order to build a working toolchain, the following source packages are needed from
133-
Apple: `cctools`, `dyld`, and `ld64`.
134-
135-
These tools inject timestamps by default, which produce non-deterministic binaries. The
136-
`ZERO_AR_DATE` environment variable is used to disable that.
137-
138-
This version of `cctools` has been patched to use the current version of `clang`'s headers
139-
and its `libLTO.so` rather than those from `llvmgcc`, as it was originally done in `toolchain4`.
140-
141-
To complicate things further, all builds must target an Apple SDK. These SDKs are free to
142-
download, but not redistributable. To obtain it, register for an Apple Developer Account,
143-
then download the [Xcode 7.3.1 dmg](https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_7.3.1/Xcode_7.3.1.dmg).
144-
145-
This file is several gigabytes in size, but only a single directory inside is needed:
146-
```
147-
Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
148-
```
149-
150-
Unfortunately, the usual Linux tools (7zip, hpmount, loopback mount) are incapable of
151-
opening this file. To create a tarball suitable for Gitian input, there are two options:
152-
153-
Using macOS, you can mount the DMG, and then create it with:
154-
```shell
155-
hdiutil attach Xcode_7.3.1.dmg
156-
tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.11.sdk.tar.gz MacOSX10.11.sdk
157-
```
158-
159-
Alternatively, you can use 7zip and SleuthKit to extract the files one by one. The script
160-
[`extract-osx-sdk.sh`](./../contrib/macdeploy/extract-osx-sdk.sh) automates this. First
161-
ensure the DMG file is in the current directory, and then run the script. You may wish to
162-
delete the `intermediate 5.hfs` file and `MacOSX10.11.sdk` (the directory) when you've
163-
confirmed the extraction succeeded.
164-
165-
```shell
166-
apt-get install p7zip-full sleuthkit
167-
contrib/macdeploy/extract-osx-sdk.sh
168-
rm -rf 5.hfs MacOSX10.11.sdk
169-
```
170-
171-
The Gitian descriptors build 2 sets of files: Linux tools, then Apple binaries which are
172-
created using these tools. The build process has been designed to avoid including the
173-
SDK's files in Gitian's outputs. All interim tarballs are fully deterministic and may be freely
174-
redistributed.
175-
176-
`genisoimage` is used to create the initial DMG. It is not deterministic as-is, so it has been
177-
patched. A system `genisoimage` will work fine, but it will not be deterministic because
178-
the file-order will change between invocations. The patch can be seen here: [theuni/osx-cross-depends](https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff).
179-
No effort was made to fix this cleanly, so it likely leaks memory badly. But it's only used for
180-
a single invocation, so that's no real concern.
181-
182-
`genisoimage` cannot compress DMGs, so afterwards, the DMG tool from the
183-
`libdmg-hfsplus` project is used to compress it. There are several bugs in this tool and its
184-
maintainer has seemingly abandoned the project. It has been forked and is available
185-
(with fixes) here: [theuni/libdmg-hfsplus](https://github.com/theuni/libdmg-hfsplus).
186-
187-
The DMG tool has the ability to create DMGs from scratch as well, but this functionality is
188-
broken. Only the compression feature is currently used. Ideally, the creation could be fixed
189-
and `genisoimage` would no longer be necessary.
190-
191-
Background images and other features can be added to DMG files by inserting a
192-
`.DS_Store` before creation. This is generated by the script
193-
`contrib/macdeploy/custom_dsstore.py`.
194-
195-
As of OS X 10.9 Mavericks, using an Apple-blessed key to sign binaries is a requirement in
196-
order to satisfy the new Gatekeeper requirements. Because this private key cannot be
197-
shared, we'll have to be a bit creative in order for the build process to remain somewhat
198-
deterministic. Here's how it works:
199-
200-
- Builders use Gitian to create an unsigned release. This outputs an unsigned DMG which
201-
users may choose to bless and run. It also outputs an unsigned app structure in the form
202-
of a tarball, which also contains all of the tools that have been previously (deterministically)
203-
built in order to create a final DMG.
204-
- The Apple keyholder uses this unsigned app to create a detached signature, using the
205-
script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs).
206-
- Builders feed the unsigned app + detached signature back into Gitian. It uses the
207-
pre-built tools to recombine the pieces into a deterministic DMG.
208-

0 commit comments

Comments
 (0)