[arch-commits] Commit in lib32-glu/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, May 3, 2022 @ 21:57:03
  Author: heftig
Revision: 1192434

9.0.2-3: debug on

Modified:
  lib32-glu/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-03 21:51:04 UTC (rev 1192433)
+++ PKGBUILD	2022-05-03 21:57:03 UTC (rev 1192434)
@@ -2,14 +2,15 @@
 
 pkgname=lib32-glu
 pkgver=9.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Mesa OpenGL utility library (32 bits)"
 arch=('x86_64')
-url="https://mesa.freedesktop.org/"
+url="https://gitlab.freedesktop.org/mesa/glu"
 license=('LGPL')
 depends=('lib32-libgl' 'glu')
-makedepends=('gcc-multilib' 'lib32-libglvnd' 'meson')
-source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.xz{,.sig}
+makedepends=('meson')
+options=('debug')
+source=(https://mesa.freedesktop.org/archive/glu/glu-$pkgver.tar.xz{,.sig}
         0001-pkgconfig-Depend-on-opengl-when-built-with-libglvnd.patch
         0002-pkgconfig-Drop-unneeded-lines-from-autotools-build.patch
         0003-pkgconfig-meson-build-should-match-autotools-require.patch)
@@ -32,7 +33,7 @@
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   arch-meson glu-$pkgver build \
     --libdir=/usr/lib32 \
@@ -41,19 +42,14 @@
   # Print config
   meson configure build
 
-  ninja -C build
   meson compile -C build
 }
 
 check() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
-
-  ninja -C build test
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
-  rm -rf "${pkgdir}"/usr/include
+  meson install -C build --destdir "$pkgdir"
+  rm -r "$pkgdir"/usr/include
 }