diff options
Diffstat (limited to 'media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch')
-rw-r--r-- | media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch new file mode 100644 index 000000000000..51a26c8e0dc8 --- /dev/null +++ b/media-libs/libglvnd/files/libglvnd-1.3.0-meson-Fix-the-PPC64-build.patch @@ -0,0 +1,54 @@ +From 5ffb8df0ae243f611a0752950443e7a9877e502c Mon Sep 17 00:00:00 2001 +From: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Fri, 6 Dec 2019 07:27:54 -0700 +Subject: [PATCH 2/2] meson: Fix the PPC64 build. + +Check for a cpu_family value of 'ppc64', not 'ppc'. 'ppc' is for 32-bit power. + +In GLdispatch, fix the file list for the PPC64 entrypoints. +--- + meson.build | 4 ++-- + src/GLdispatch/vnd-glapi/meson.build | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 44c7172..602e837 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ if not with_asm.disabled() + add_project_arguments('-DUSE_ARMV7_ASM', language : 'c') + elif host_machine.cpu_family() == 'aarch64' + add_project_arguments('-DUSE_AARCH64_ASM', language : 'c') +- elif host_machine.cpu_family() == 'ppc' and host_machine.endian() == 'little' ++ elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little' + add_project_arguments('-DUSE_PPC64LE_ASM', language : 'c') + elif with_asm.enabled() + error('No ASM available for @0@ (@1@ endian)'.format(host_machine.system(), host_machine.endian())) +@@ -118,7 +118,7 @@ if use_asm + elif host_machine.cpu_family() == 'aarch64' + gl_dispatch_type = 'aarch64_tsd' + elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little' +- gl_dispatch_type = 'ppc64le_@1@'.format(have_tls ? 'tls' : 'tsd') ++ gl_dispatch_type = 'ppc64le_@0@'.format(have_tls ? 'tls' : 'tsd') + endif + endif + add_project_arguments('-DGLDISPATCH_TYPE_@0@'.format(gl_dispatch_type.to_upper()), language : ['c']) +diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build +index ce20178..200d476 100644 +--- a/src/GLdispatch/vnd-glapi/meson.build ++++ b/src/GLdispatch/vnd-glapi/meson.build +@@ -55,9 +55,9 @@ else + elif gl_dispatch_type == 'aarch64_tsd' + _entry_files += 'entry_aarch64_tsd.c' + elif gl_dispatch_type == 'ppc64le_tls' +- _entry_files += 'entry_aarch64_tls.c' ++ _entry_files += 'entry_ppc64le_tls.c' + elif gl_dispatch_type == 'ppc64le_tsd' +- _entry_files += 'entry_aarch64_tsd.c' ++ _entry_files += 'entry_ppc64le_tsd.c' + else + error('No matching ASM file for @0@'.format(gl_dispatch_type)) + endif +-- +2.23.0 + |