summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072022-02-17 23:41:21 +0100
committersL1pKn072022-02-17 23:41:21 +0100
commitae9ff9c290a1ded3110ec6a65766fd6d56b7b24d (patch)
tree4e061c6284f7560a555cb04c408807261be70efc
parentad5aafaf195edd4da77d359a856e81c7cb0fb9a2 (diff)
downloadaur-ae9ff9c290a1ded3110ec6a65766fd6d56b7b24d.tar.gz
bump
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 12 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a2c468b3c91..7f094616829c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = khronos-ocl-icd-git
- pkgver = 2022.01.04.1.gb7a648b
+ pkgver = 2022.01.04.2.gcd7d07c
pkgrel = 1
url = http://www.khronos.org/registry/cl
arch = x86_64
@@ -7,6 +7,8 @@ pkgbase = khronos-ocl-icd-git
makedepends = git
makedepends = cmake
makedepends = opencl-headers-git
+ makedepends = lib32-gcc-libs
+ options = debug
source = ocl::git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 02fa223c44ae..2a64c1932617 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=khronos-ocl-icd-git
pkgname=('khronos-ocl-icd-git'
'lib32-khronos-ocl-icd-git'
)
-pkgver=2022.01.04.1.gb7a648b
+pkgver=2022.01.04.2.gcd7d07c
pkgrel=1
arch=('x86_64')
url="http://www.khronos.org/registry/cl"
@@ -12,9 +12,11 @@ license=('apache')
makedepends=('git'
'cmake'
'opencl-headers-git'
+ 'lib32-gcc-libs'
)
source=('ocl::git+https://github.com/KhronosGroup/OpenCL-ICD-Loader.git')
sha256sums=('SKIP')
+options=('debug')
pkgver() {
cd ocl
@@ -22,33 +24,29 @@ pkgver() {
}
prepare() {
- mkdir -p build{32,64}
-
# fix .cmake path
sed 's|${CMAKE_INSTALL_DATADIR}/cmake|${CMAKE_INSTALL_LIBDIR}/cmake|g' -i ocl/CMakeLists.txt
}
build() {
- cd "${srcdir}/build64"
- cmake ../ocl \
+ cmake -S ocl -B build64 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_TESTING=ON
- make
+ cmake --build build64
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- cd "${srcdir}/build32"
- cmake ../ocl \
+ cmake -S ocl -B build32 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib32 \
-DBUILD_TESTING=ON
- make
+ cmake --build build32
}
check() {
@@ -67,7 +65,7 @@ conflicts=('khronos-ocl-icd'
'opencl-icd-loader'
'ocl-icd'
)
- make -C build64 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" cmake --build build64 --target install
install -Dm644 ocl/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
@@ -83,7 +81,7 @@ conflicts=('lib32-khronos-ocl-icd'
'lib32-opencl-icd-loader'
'lib32-ocl-icd'
)
- make -C build32 DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" cmake --build build32 --target install
install -Dm644 ocl/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}