From 892f9e73f376acf90344da98a0ea24d3ff556fdc Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 26 May 2024 13:54:03 -0500 Subject: user/glm: TEMPORARY fix for #1170 - DO NOT MERGE This patch is ONLY to be able to build the entire tree for gcc13 trybuild. We will NOT ship it like this for beta6. --- user/glm/APKBUILD | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'user/glm') diff --git a/user/glm/APKBUILD b/user/glm/APKBUILD index 54c1d2be6..b3bb9e0ab 100644 --- a/user/glm/APKBUILD +++ b/user/glm/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: Max Rees pkgname=glm pkgver=0.9.9.5 -pkgrel=0 +pkgrel=1 pkgdesc="C++ header-only mathematics library for graphics programming" url="https://glm.g-truc.net/" arch="noarch" +options="!check" # TEMPORARY, DO NOT PUSH TO CURRENT - see #1170 license="MIT OR Custom:Happy-Bunny" makedepends="cmake" source="https://github.com/g-truc/glm/releases/download/$pkgver/$pkgname-$pkgver.zip @@ -15,24 +16,24 @@ replaces="glm-dev" build() { mkdir build - cd build - cmake .. \ + # See #1170, and upstream#1087 + export CXXFLAGS="$CXXFLAGS -fno-ipa-modref" + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DGLM_TEST_ENABLE=bool:ON - make + -DGLM_TEST_ENABLE=bool:ON \ + -Bbuild + make -C build } check() { - cd build - make test + make -C build test } package() { - cd build - make install DESTDIR="$pkgdir" + make -C build install DESTDIR="$pkgdir" } sha512sums="ea4f03d31596e27bd8c3d8d0a82a3ae0050ec0df5a747f3d92e467eacab579bb8b191499cb63bf8574da7a1085b9fe6dd7cd0ce93b758d8d7978b2389cc58b94 glm-0.9.9.5.zip -- cgit v1.2.3-70-g09d2