From aa86725b4b044e066ed255632b1cffad59233862 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Sat, 16 Feb 2019 19:19:02 +1300
Subject: [PATCH] libomp: remove conflict with libgomp-devel
---
srcpkgs/libomp/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index acf89aa817..de75b12d3d 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,7 +1,7 @@
# Template file for 'libomp'
pkgname=libomp
version=7.0.1
-revision=1
+revision=2
wrksrc="openmp-${version}.src"
build_style=cmake
configure_args="-DLIBOMP_ENABLE_SHARED=ON"
@@ -14,13 +14,15 @@ homepage="https://openmp.llvm.org"
distfiles="https://releases.llvm.org/${version}/openmp-${version}.src.tar.xz"
checksum=bf16b78a678da67d68405214ec7ee59d86a15f599855806192a75dcfca9b0d0c
+post_install() {
+ # libgomp.so is also provided by libgomp-devel, fix conflict
+ rm ${PKGDESTDIR}/usr/lib/libgomp.so
+}
+
libomp-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
- # libgomp.so is also provided by libgomp-devel
- conflicts="libgomp-devel"
pkg_install() {
vmove usr/include
- vmove usr/lib/libgomp.so
}
}