diff options
author | Daniel Bermond | 2021-06-03 21:58:03 +0000 |
---|---|---|
committer | Daniel Bermond | 2021-06-03 21:58:03 +0000 |
commit | 012877bc0f1c96dfc24a45b1e90dcca73b89bf8b (patch) | |
tree | 27b1a4cbccc394119266b5f248d9d983a66b736c | |
parent | 1e185ba12de31af6e52cefd10607ea40a13706d3 (diff) | |
download | aur-012877bc0f1c96dfc24a45b1e90dcca73b89bf8b.tar.gz |
Fix build with new makepkg.conf flags. Remove highway files.
New makepkg.conf enables the _GLIBCXX_ASSERTIONS macro by default,
with currently breaks the tests on version 0.3.7.
Remove unneeded highway files, as we are building with bundled
highway due to incompatible highway 0.12.2.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = libjxl pkgdesc = JPEG XL image format reference implementation pkgver = 0.3.7 - pkgrel = 1 + pkgrel = 2 url = https://jpeg.org/jpegxl/ arch = x86_64 license = Apache @@ -3,7 +3,7 @@ pkgbase=libjxl pkgname=('libjxl' 'libjxl-doc') pkgver=0.3.7 -pkgrel=1 +pkgrel=2 pkgdesc='JPEG XL image format reference implementation' arch=('x86_64') url='https://jpeg.org/jpegxl/' @@ -58,6 +58,9 @@ prepare() { } build() { + # https://github.com/libjxl/libjxl/issues/98 + export CXXFLAGS="${CXXFLAGS/ -Wp,-D_GLIBCXX_ASSERTIONS/}" + export CC='clang' export CXX='clang++' cmake -B build -S libjxl \ @@ -93,6 +96,7 @@ package_libjxl() { replaces=('libjpeg-xl') make -C build DESTDIR="$pkgdir" install + rm -rf "${pkgdir}/usr"/{include/{contrib,hwy},lib/{pkgconfig/,}libhwy*} } package_libjxl-doc() { |