Skip to content

Conversation

theuni
Copy link
Member

@theuni theuni commented Jun 9, 2016

This bumps us to:

  • SDK: 10.11
  • clang: 3.7.1
  • cctools: 877.8
  • ld64: 253.9

Beyond just keeping us current, this is also necessary for #7770.
The bump doesn't change anything in terms of back-compat, we still specify 10.7 as the required minimum.

Todo before merge:

  • Depends on [WIP] [depends] Qt 5.6.1 #8053. The qt change here should be reverted after that.
  • I need to thoroughly review the cctools/ld64 bump, this was just a quick port.
  • Docs need to be updated to reflect the switch to 10.11 sdk.

@@ -124,6 +124,7 @@ define $(package)_preprocess_cmds
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
sed -i.old 's/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0)/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft)/' qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the todo in description, this was fixed in 5.6.

You'd have to cast like (CGMouseButton)0.

@jonasschnelli
Copy link
Contributor

jonasschnelli commented Jun 9, 2016

Nice!
utACK f5ade22.
Started a OSX only gitian build here: https://bitcoin.jonasschnelli.ch/pulls/8184/

I can take care of the docs.

Question: would it be to restrictive to set 10.8 as minimum deployment version (OSX_MIN_VERSION)? It would allow us to get rid of some hack in https://github.com/bitcoin/bitcoin/blob/master/src/qt/macnotificationhandler.mm?

@theuni
Copy link
Member Author

theuni commented Jun 9, 2016

@jonasschnelli afaik 10.7 is the pretty standard minimum these days, but we could always bump if desired. It doesn't look like that runtime check really hurts anything, though?

@fanquake
Copy link
Member

@jonasschnelli Is that the only 10.8 related hack in the codebase?

@jonasschnelli
Copy link
Contributor

@fanquake: bumping to 10.8 could allow use to use the NSNotificationCenter without weak linking.

But after thinking about it, I guess we should keep 10.7 as min for 0.13 (maybe also for 0.14).

@jonasschnelli
Copy link
Contributor

Tested ACK f5ade22.

Did a gitian build, ran binaries on 10.11 and on a 10.07 machine:
bildschirmfoto 2016-06-10 um 11 42 04

@laanwj
Copy link
Member

laanwj commented Jun 10, 2016

Question: would it be to restrictive to set 10.8 as minimum deployment version (OSX_MIN_VERSION)? It would allow us to get rid of some hack in

I think that's a pretty weak reason to drop support for an OS version. I'd also say stick with 10.7 as minimum for the foreseeable future.

@fanquake
Copy link
Member

fanquake commented Jun 12, 2016

I've put together some changes to the build-notes here if you'd like to cherry pick.

The 10.11 SDK is first available in Xcode 7.1, any opinions on wether we should target that for the new download vs 7.3.1 ?

@laanwj
Copy link
Member

laanwj commented Jun 20, 2016

Closing in favor of #8210

@fanquake Probably want to PR those separately

@maflcko maflcko modified the milestone: 0.13.0 Jun 20, 2016
@laanwj laanwj closed this Jun 20, 2016
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants