-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
meson: update to 0.62.1, add cross-files for ppc & ppc64
- Loading branch information
1 parent
2fd08a2
commit 9eaac52
Showing
5 changed files
with
39 additions
and
33 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[host_machine] | ||
system = 'darwin' | ||
cpu_family = 'ppc' | ||
cpu = 'ppc' | ||
endian = 'big' | ||
|
||
[binaries] | ||
pkgconfig = '@@PREFIX@@/bin/pkg-config' | ||
cmake = '@@PREFIX@@/bin/cmake' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[host_machine] | ||
system = 'darwin' | ||
cpu_family = 'ppc64' | ||
cpu = 'ppc64' | ||
endian = 'big' | ||
|
||
[binaries] | ||
pkgconfig = '@@PREFIX@@/bin/pkg-config' | ||
cmake = '@@PREFIX@@/bin/cmake' |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,12 @@ | ||
Upstream: https://github.com/mesonbuild/meson/pull/9211 | ||
|
||
Fix the following error when configuring pango (or any project with | ||
appleframeworks listed as a dependency) using GCC: | ||
|
||
ERROR: Dependency "appleframeworks" not found, tried framework | ||
--- mesonbuild/compilers/mixins/clike.py.orig 2021-09-02 16:07:01.000000000 -0400 | ||
+++ mesonbuild/compilers/mixins/clike.py 2021-09-02 16:07:36.000000000 -0400 | ||
@@ -1199,9 +1199,6 @@ | ||
Finds the framework with the specified name, and returns link args for | ||
the same or returns None when the framework is not found. | ||
--- mesonbuild/compilers/mixins/clike.py.orig 2022-01-03 04:12:32.000000000 +0800 | ||
+++ mesonbuild/compilers/mixins/clike.py 2022-04-06 05:50:19.000000000 +0800 | ||
@@ -1123,9 +1123,6 @@ | ||
unless you select a particular macOS SDK with the -isysroot flag. | ||
You can also add to this by setting -F in CFLAGS. | ||
''' | ||
- # TODO: maybe this belongs in clang? also, should probably check for macOS? | ||
- # TODO: this really needs to be *AppleClang*, not just any clang. | ||
- if self.id != 'clang': | ||
- raise mesonlib.MesonException('Cannot find frameworks with non-clang compiler') | ||
return self._find_framework_impl(name, env, extra_dirs, allow_system) | ||
|
||
def get_crt_compile_args(self, crt_val: str, buildtype: str) -> T.List[str]: | ||
- raise mesonlib.MesonException('Cannot find framework path with non-clang compiler') | ||
# Construct the compiler command-line | ||
commands = self.get_exelist() + ['-v', '-E', '-'] | ||
commands += self.get_always_args() |
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
9eaac52
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
meson cannot build pango on PPC/Tiger
When building pango, the following error occurs:
This issue is a regression due to the wrong patch-file.
The meson port includes two versions (0.62.1 and 0.58.2).
On Tiger, version 0.58.2 of meson is installed.
But the patch-files are not for version 0.58.2.
Then this issue occurs.
(The previous version of patch-file works well)
9eaac52
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be fixed by
4397617