summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse R Codling2024-03-23 21:25:28 -0400
committerJesse R Codling2024-03-23 21:28:56 -0400
commit013855f452c27b26927561cf7afa598d46ed5de4 (patch)
tree42f3db59a72b30987231943c2a8d1a34df92e058
parent5bb86116787d4e096782d5b0285ed43841abd715 (diff)
downloadaur-aocl.tar.gz
Fixup ${pkgdir} reference in CMake, pkgconfig
With these fixes, building and linking against the FFTW in here should work properly again. Also has the side benefit of `makepkg` not throwing up warnings anymore :)
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b0837f33a5a9..bd96a8052660 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = aocl
pkgdesc = AMD Optimizing CPU Libraries
pkgver = 4.2.0
- pkgrel = 1
+ pkgrel = 2
url = https://developer.amd.com/amd-aocl/
arch = x86_64
license = custom
diff --git a/PKGBUILD b/PKGBUILD
index 0a0a9e9e7965..bc407351c76e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=aocl
pkgname=(aocl-aocc aocl-gcc)
pkgver=4.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="AMD Optimizing CPU Libraries"
arch=('x86_64')
license=('custom')
@@ -49,8 +49,8 @@ package_aocl-aocc() {
patchelf --add-needed ${aocl_prefix}/aocc/lib_ILP64/libblis-mt.so ${prefix}/aocc/lib_ILP64/libflame.so
patchelf --add-needed ${aocl_prefix}/aocc/lib_LP64/libblis-mt.so ${prefix}/aocc/lib_LP64/libflame.so
- # fix amd-libs.cfg containing ${pkgdir}
- sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/aocc/amd-libs.cfg
+ # fix amd-libs.cfg, pkgconfig, and cmake files containing ${pkgdir}
+ sed -e "s:/.*/opt:/opt:g" -si ${prefix}/aocc/amd-libs.cfg ${prefix}/aocc/lib_*P64/pkgconfig/* ${prefix}/aocc/lib_*P64/cmake/*/*.cmake
# env-modules (optional)
cp ${srcdir}/modulefile ${prefix}/aocc
@@ -80,8 +80,8 @@ package_aocl-gcc() {
patchelf --add-needed ${aocl_prefix}/gcc/lib_ILP64/libblis-mt.so ${prefix}/gcc/lib_ILP64/libflame.so
patchelf --add-needed ${aocl_prefix}/gcc/lib_LP64/libblis-mt.so ${prefix}/gcc/lib_LP64/libflame.so
- # fix amd-libs.cfg containing ${pkgdir} and ${pkgver}
- sed -e "s:=.*/opt:=/opt:g" -e "s:/${pkgver}::g" -i ${prefix}/gcc/amd-libs.cfg
+ # fix amd-libs.cfg, pkconfig, and cmake files containing ${pkgdir} and ${pkgver}
+ sed -e "s:/.*/opt:/opt:g" -e "s:/${pkgver}::g" -si ${prefix}/gcc/amd-libs.cfg ${prefix}/gcc/lib_*P64/pkgconfig/* ${prefix}/gcc/lib_*P64/cmake/*/*.cmake
# env-modules (optional)
cp ${srcdir}/modulefile ${prefix}/gcc