This repository was archived by the owner on Aug 8, 2024. It is now read-only.
Make this work on BigSur/M1 #169
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vargaz
reviewed
Apr 29, 2021
| @@ -105,16 +106,19 @@ def run(self): | |||
|
|
|||
| loginit('bockbuild (%s)' % (self.bockbuild_rev)) | |||
| info('cmd: %s' % ' '.join(sys.argv)) | |||
|
|
|||
| progress ('here') | |||
| if len (sys.argv) < 2: | |||
vargaz
reviewed
Apr 29, 2021
| if len (sys.argv) < 2: | ||
| info ('Profiles in %s --' % self.git ('config --get remote.origin.url', self.profile_root)[0]) | ||
| info(map (lambda x: '\t%s: %s' % (x.name, x.description), self.profiles)) | ||
| finish (exit_codes.FAILURE) | ||
|
|
||
| global active_profile | ||
| progress (sys.argv[1]) | ||
| Package.profile = active_profile = self.load_profile (sys.argv[1]) |
vargaz
reviewed
Apr 29, 2021
| package.local_ld_flags = ['-arch i386', '-arch x86_64'] | ||
| package.local_gcc_flags = ['-arch i386', '-arch x86_64'] | ||
| if arch == 'darwin-arm64': | ||
| package.local_ld_flags = ['-arch arm64'] |
vargaz
reviewed
Apr 29, 2021
| elif arch == 'darwin-32': | ||
| package.local_ld_flags = ['-arch i386', '-m32'] |
There was a problem hiding this comment.
Why is this in the darwin-32 block ?
vargaz
reviewed
Apr 29, 2021
| @@ -306,7 +310,7 @@ def __init__(self): | |||
| Profile.FileProcessor.__init__(self, match=match_stageable_binary) | |||
|
|
|||
| def process(self, path): | |||
| run_shell('dsymutil -t 2 "%s" >/dev/null' % path) | |||
| run_shell('dsymutil "%s" >/dev/null' % path) | |||
vargaz
reviewed
Apr 29, 2021
| @@ -13,12 +13,12 @@ def install(self): | |||
|
|
|||
| def arch_build(self, arch): | |||
| if arch == 'darwin-universal': | |||
| self.local_ld_flags = ['-arch i386', '-arch x86_64'] | |||
There was a problem hiding this comment.
Do we still care for 32 bit ?
vargaz
reviewed
Apr 29, 2021
| @@ -235,7 +235,8 @@ def __init__(self): | |||
|
|
|||
| # https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1092021/ | |||
| 'patches/gtk/0078-Optimize-querying-symbolic-hotkeys.patch', | |||
| 'patches/gtk/gdk-quartz-Remove-titlebar-handling-from-find_child.patch' | |||
| 'patches/gtk/gdk-quartz-Remove-titlebar-handling-from-find_child.patch', | |||
| 'patches/gtk/bigsurfix.patch' | |||
There was a problem hiding this comment.
Perhaps newer versions don't need this (or other) patches ?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are the patches that I did last year, but they were against the Xamarin/BockBuild fork which was the old, proprietary one, and not the open source one.