Arch Linux User Repository

Updated version, and changed to better match upstream PKGBUILD

diff --git a/PKGBUILD b/PKGBUILD
index 4fd35fc..95537de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,54 +5,52 @@


 pkgname=lib32-spirv-tools
-pkgver=2021.4
+pkgver=2022.2
 pkgrel=1
-_headers_version=sdk-1.2.198.0
 pkgdesc="API and commands for processing SPIR-V modules"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+arch=('x86_64')
 url='https://github.com/KhronosGroup/SPIRV-Tools'
 license=('Apache')
-groups=('vulkan-devel')
+groups=(vulkan-devel)
 depends=('lib32-gcc-libs'
          'spirv-tools'
 )
 makedepends=('cmake'
              'python'
              'git'
+             'ninja'
+             'spirv-headers'
 )
-source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}"
-        "git+https://github.com/KhronosGroup/SPIRV-Headers.git#tag=${_headers_version}"
-)
-sha256sums=('SKIP'
-            'SKIP'
-)
+source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}")
+sha256sums=('SKIP')

 build() {
+  cd SPIRV-Tools
+
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"

-  mkdir -p build
-  cd build
-
-  cmake ../SPIRV-Tools \
+  cmake \
+      -Bbuild \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_INSTALL_LIBDIR=lib32 \
-      -DCMAKE_BUILD_TYPE=RELEASE \
-      -DSPIRV_WERROR=OFF \
-      -DSPIRV-Headers_SOURCE_DIR="${srcdir}/SPIRV-Headers"
-
-  make
+      -DCMAKE_BUILD_TYPE=Release \
+      -DSPIRV_WERROR=Off \
+      -DSPIRV-Headers_SOURCE_DIR="/usr"
+  ninja -C build
 }

 package() {
-  make -C build DESTDIR="${pkgdir}" install
+  cd SPIRV-Tools
+  DESTDIR="${pkgdir}" ninja -C build install

   # remove files
   rm -fr "${pkgdir}/usr/include"
   rm -fr "${pkgdir}/usr/share"

-  install -Dm644 SPIRV-Tools/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

   cd "${pkgdir}/usr/bin"
   for i in $(find . -type f); do mv ${i} ${i}-32; done

Sure Mars, you're welcome! =) I've returned the source repos to use .git in the URL. Thank you for your observations about it.

Thanks for update, your work is appreciated! :)

I've made one mistaken recommendation though.

I suggested to eliminate the '.git' suffix from GitHub repo URLs.

I've since came to learn that using the '.git' suffix is still preferred. That is the canonical form (de-facto standard) for all Git hosters. (Even GitHub uses it on its website when you click on Clone.)

GitHub's behavior in accepting commandline URLs without the '.git' suffix and not redirecting to a suffixed one is unusual, AFAIK undocumented, and actually can lead to problems with makepkg source caching.

(If makepkg is set up to use a common source cache, it will not know that an already existing local repo cloned from GitHub with the '.git' suffix is the same repo as the one without it, and will error out in such cases).

So I'd like to ask you to change the source URLs back to using '.git':

source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}"
        "git+https://github.com/KhronosGroup/SPIRV-Headers.git#tag=${_headers_version}"

Some other AUR packages use SPIRV sources from GitHub, and they also use the preferred ".git" ending. Sticking to that will ensure that makepkg can smartly manage the common source cache and use the same local clone for different PKGBUILDs.

I had missed the previous comments, just tried oxalin's patch with fixed SPIRV-Headers revision and it works for both versions 2021.1 and 2021.2, so package is updated and currently building with no errors.

This Package is still broken, could you try oxalin's patch please?

To be able to build against 2021.1, could you apply the following patch to PKGBUILD? I think this should also fix build againt 2021.2.

From e4ec3521431ea38a299fa2995cbf566cf7a1fc34 Mon Sep 17 00:00:00 2001
From: Alexandre Demers <alexandre.f.demers@gmail.com>
Date: Sun, 4 Jul 2021 14:05:12 -0400
Subject: [PATCH] Fix 2021.1 build with the right SPIRV-Headers revision

Specify release type at the same time.

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
---
 PKGBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index 656b4f2..a408c5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,6 +28,9 @@ prepare() {
   mkdir -p build

   alias widl=
+
+  cd "${srcdir}/SPIRV-Headers"
+  git reset --hard cf00fad5b4374c1ee10b46659d2766797769a658
 }

 build() {
@@ -40,7 +43,7 @@ build() {
   cmake ../SPIRV-Tools \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_INSTALL_LIBDIR=lib32 \
-      -DCMAKE_BUILD_TYPE=None \
+      -DCMAKE_BUILD_TYPE=RELEASE \
       -DSPIRV_WERROR=OFF \
       -DSPIRV-Headers_SOURCE_DIR="${srcdir}/SPIRV-Headers"

-- 
2.32.0

Nothing to do with GCC, the problem comes from SPIRV-Headers which doesn't contain either enum.

SPIRV-Tools' code (https://github.com/KhronosGroup/SPIRV-Tools/blob/master/include/spirv-tools/libspirv.h) points to https://github.com/KhronosGroup/SPIRV-Headers/pull/177. However, searching through latest SPIRV-Headers' code, neither 'SPV_OPERAND_TYPE_QUANTIZATION_MODES' nor 'SPV_OPERAND_TYPE_OVERFLOW_MODES' can be found.

This is not the first time that someone f***ed SPIRV dependencies. I'm reporting the issue upstream.

Package is broken as @CraigRat says. If I remember, GCC has "recently" received an update (well not recently but I only got the update on arch recently). Might it be the new version of GCC? I am using GCC 11.1 and I had yesterday another bug as well because of this new version with Google Test.

Hello, I'm getting this with 2021.1:

/home/<redacted>/lib32-spirv-tools/src/build/operand.kinds-unified1.inc:1271:4: error: ‘SPV_OPERAND_TYPE_QUANTIZATION_MODES’ was not declared in this scope; did you mean ‘SPV_OPERAND_TYPE_FPOPERATION_MODE’?
1271 |   {SPV_OPERAND_TYPE_QUANTIZATION_MODES, ARRAY_SIZE(pygen_variable_QuantizationModesEntries), pygen_variable_QuantizationModesEntries},
      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |    SPV_OPERAND_TYPE_FPOPERATION_MODE
/home/<redacted>/lib32-spirv-tools/src/build/operand.kinds-unified1.inc:1273:4: error: ‘SPV_OPERAND_TYPE_OVERFLOW_MODES’ was not declared in this scope; did you mean ‘SPV_OPERAND_TYPE_MEMORY_MODEL’?
1273 |   {SPV_OPERAND_TYPE_OVERFLOW_MODES, ARRAY_SIZE(pygen_variable_OverflowModesEntries), pygen_variable_OverflowModesEntries},
      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |    SPV_OPERAND_TYPE_MEMORY_MODEL
make[2]: *** [source/CMakeFiles/SPIRV-Tools-shared.dir/build.make:263: source/CMakeFiles/SPIRV-Tools-shared.dir/operand.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:679: source/CMakeFiles/SPIRV-Tools-shared.dir/all] Error 2
make: *** [Makefile:146: all] Error 2