Date: Fri, 5 Aug 2022 11:58:15 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9de7f58639d3 - main - x11-servers/xorg-server: fix build on powerpc Message-ID: <202208051158.275BwF0Y048062@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9de7f58639d3a62cdaf375611f8d837cb543b674 commit 9de7f58639d3a62cdaf375611f8d837cb543b674 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2022-08-05 11:57:45 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2022-08-05 11:58:09 +0000 x11-servers/xorg-server: fix build on powerpc --- .../xorg-server/files/patch-hw_xfree86_os-support_meson.build | 4 ++-- x11-servers/xorg-server/files/patch-meson.build | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build index 400068d37709..12373890385d 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build @@ -1,11 +1,11 @@ ---- hw/xfree86/os-support/meson.build.orig 2022-08-04 15:48:52 UTC +--- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57 UTC +++ hw/xfree86/os-support/meson.build @@ -113,7 +113,7 @@ elif host_machine.system().endswith('bsd') endif elif host_machine.cpu_family() == 'arm' srcs_xorg_os_support += 'bsd/arm_video.c' - elif host_machine.cpu_family() == 'powerpc' -+ elif host_machine.cpu_family() == 'powerpc' or host_machine.cpu_family() == 'ppc64' ++ elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64' srcs_xorg_os_support += 'bsd/ppc_video.c' elif host_machine.cpu_family() == 'sparc64' srcs_xorg_os_support += 'bsd/sparc64_video.c' diff --git a/x11-servers/xorg-server/files/patch-meson.build b/x11-servers/xorg-server/files/patch-meson.build new file mode 100644 index 000000000000..83f00aa7237e --- /dev/null +++ b/x11-servers/xorg-server/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2022-08-05 11:53:38 UTC ++++ meson.build +@@ -249,7 +249,7 @@ if int10 == 'auto' + int10 = get_option('int10') + if int10 == 'auto' + int10 = 'x86emu' +- if host_machine.cpu() == 'powerpc' and host_machine.system() == 'freebsd' ++ if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd' + int10 = 'stub' + endif + if host_machine.cpu() == 'arm'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208051158.275BwF0Y048062>