From 82e4f7114e26ed9d5a25704cecfee3509b1d2ea6 Mon Sep 17 00:00:00 2001
From: SupervisedThinking <supervisedthinking@gmail.com>
Date: Fri, 28 Oct 2022 15:13:57 +0200
Subject: [PATCH] vulkan-loader: fix asm_offset hacks

---
 .../graphics/vulkan/vulkan-loader/package.mk  | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/packages/graphics/vulkan/vulkan-loader/package.mk b/packages/graphics/vulkan/vulkan-loader/package.mk
index 83f05b03c0..5e6da5b37d 100644
--- a/packages/graphics/vulkan/vulkan-loader/package.mk
+++ b/packages/graphics/vulkan/vulkan-loader/package.mk
@@ -8,16 +8,10 @@ PKG_SHA256="3e30621aea870bfe12227018e73926d4bfacb46b0b207553eb2ebd966df1b202"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host vulkan-headers:host"
-PKG_DEPENDS_TARGET="toolchain vulkan-headers"
+PKG_DEPENDS_TARGET="toolchain Python3:host vulkan-headers"
 PKG_LONGDESC="Vulkan Installable Client Driver (ICD) Loader."
 
 configure_package() {
-  # Builds asm_offset binary for GAS / GNU Assembler
-  if [ "${ARCH}" != "arm" ]; then
-    PKG_DEPENDS_TARGET+=" vulkan-loader:host"
-  fi
-
   # Displayserver Support
   if [ "${DISPLAYSERVER}" = "x11" ]; then
     PKG_DEPENDS_TARGET+=" libxcb libX11"
@@ -26,21 +20,6 @@ configure_package() {
   fi
 }
 
-pre_configure_host() {
-  PKG_CMAKE_OPTS_HOST="-DBUILD_WSI_XCB_SUPPORT=OFF \
-                       -DBUILD_WSI_XLIB_SUPPORT=OFF \
-                       -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-                       -DBUILD_TESTS=OFF"
-
-  # Hack to workaround missing options to build a standalone asm_offset binary,
-  # if the glibc version of the host & target system differs build will fail otherwise.
-  sed -e 's|COMMAND asm_offset GAS|COMMAND ./asm_offset GAS|g' -i ${PKG_BUILD}/loader/CMakeLists.txt
-}
-
-makeinstall_host() {
-  cp ${PKG_BUILD}/.${HOST_NAME}/loader/asm_offset ${TOOLCHAIN}/bin/
-}
-
 pre_configure_target() {
   PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTS=OFF"
 
@@ -62,7 +41,4 @@ pre_configure_target() {
                              -DBUILD_WSI_XLIB_SUPPORT=OFF \
                              -DBUILD_WSI_WAYLAND_SUPPORT=OFF"
   fi
-
-  # Hack to run asm_offset located at toolchain path
-  sed -e 's|COMMAND ./asm_offset GAS|COMMAND asm_offset GAS|g' -i ${PKG_BUILD}/loader/CMakeLists.txt
 }