Re: graphics/vulkan-loader doesn't build on aarch64

On Sun, Jan 02, 2022 at 10:14:45AM +1100, Jonathan Gray wrote:
> On Sat, Jan 01, 2022 at 08:11:34PM +0100, Matthieu Herrb wrote:
> > Hi,
> >
> > graphics/vulkan-loader fails to build here on Pine Book Pro. Below is
> > the log from dpb.
> >
> > It's now a depency for poppler (via qt apparently) so it taks down
> > XFCE packages.
>
> builds with a backported patch

Thanks. Seems to work for me.

> https://github.com/KhronosGroup/Vulkan-Loader/commit/a11162fcaca808eb91c0fa4fbcce99bbcd5d3be2
> https://github.com/KhronosGroup/Vulkan-Loader/pull/774
>
> --- /dev/null Sun Jan 2 10:07:56 2022
> +++ patches/patch-loader_unknown_ext_chain_gas_aarch64_S Sun Jan 2 10:06:32 2022
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +loader/aarch64: attempt to avoid text relocations in the unknown code
> +a11162fcaca808eb91c0fa4fbcce99bbcd5d3be2
> +
> +Index: loader/unknown_ext_chain_gas_aarch64.S
> +--- loader/unknown_ext_chain_gas_aarch64.S.orig
> ++++ loader/unknown_ext_chain_gas_aarch64.S
> +@@ -50,7 +50,8 @@ terminError\num:
> + mov x0, x11 // Vulkan instance pointer (first arg)
> + mov x1, VK_DEBUG_REPORT_ERROR_BIT_EXT // The error logging bit (second arg)
> + mov x2, #0 // Zero (third arg)
> +- ldr x3, =termin_error_string // The error string (fourth arg)
> ++ adrp x9, termin_error_string
> ++ add x3, x9, #:lo12:termin_error_string // The error string (fourth arg)
> + ldr x4, [x11, x10] // The function name (fifth arg)
> + bl loader_log // Log the error message before we crash
> + mov x0, #0
>

--
Matthieu Herrb