diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-28 23:16:41 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-08-29 21:21:43 +0300 |
| commit | 4693825ec3b8e7031ae4d1f57813abfd8b60d63b (patch) | |
| tree | ca13ff7683686a6940f0b4ba136800545430b905 /bockbuild | |
| parent | 1d8d36b67c1045e69afe6c40f771f438735457a9 (diff) | |
Build pkg-config as 64bit only, libtiff as universal and remove gtk-quartz-engine.py
We hit troubles (https://github.com/mono/mono/issues/13804) which are apparently related to lipo'ing so move the three packages that use it away from it.
- pkg-config doesn't build as universal since the internal glib doesn't build because of 32/64bit configure mismatches (we'd need to do similar patches to what we do in glib.py) so just make it 64bit only.
- libtiff also runs into the 32/64bit configure mismatch but we can fix it with a simple patch.
I tested it works by running the repro from https://xamarin.github.io/bugzilla-archives/39/39865/bug.html .
- gtk-quartz-engine.py is no longer used by MD/VSMac according to the team so remove it completely.
Diffstat (limited to 'bockbuild')
| -rw-r--r-- | bockbuild/package.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bockbuild/package.py b/bockbuild/package.py index 08a388d..183580d 100644 --- a/bockbuild/package.py +++ b/bockbuild/package.py @@ -44,10 +44,11 @@ class Package: # fat binary parameters. On a 64-bit Darwin profile (m64 = True) # each package must decide if it will a) perform a multi-arch (64/32) build # b) request two builds that are lipoed at the end or c) request a 32-bit - # build only. + # build only or d) request a 64-bit build only. self.needs_lipo = False self.m32_only = False + self.m64_only = False self.build_dependency = False self.dont_clean = False self.needs_build = None @@ -514,6 +515,8 @@ class Package: stagedir_x32, package_stage, 'bin', '32', '64') elif arch == 'toolchain': package_stage = self.do_build('darwin-64') + elif self.m64_only: + package_stage = self.do_build('darwin-64') elif self.m32_only: package_stage = self.do_build('darwin-32') else: |