[PR PATCH] [WIP] libomp: update to 8.0.0.

[PR PATCH] [WIP] libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is a new pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages libomp
https://github.com/void-linux/void-packages/pull/11546

[WIP] libomp: update to 8.0.0.


A patch file from https://github.com/void-linux/void-packages/pull/11546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libomp-11546.patch --]
[-- Type: application/text/x-diff, Size: 1398 bytes --]

From 31e91ba8fe2e8bf256a540bbd8e4ed318196dd86 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 08:48:15 +1000
Subject: [PATCH] libomp: update to 8.0.0.

---
 srcpkgs/libomp/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index de75b12d3df..2247728984c 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,10 +1,10 @@
 # Template file for 'libomp'
 pkgname=libomp
-version=7.0.1
-revision=2
+version=8.0.0
+revision=1
 wrksrc="openmp-${version}.src"
 build_style=cmake
-configure_args="-DLIBOMP_ENABLE_SHARED=ON"
+configure_args="-DLIBOMP_ENABLE_SHARED=ON -DLIBOMP_INSTALL_ALIASES=OFF"
 hostmakedepends="perl pkg-config"
 makedepends="elfutils-devel libffi-devel"
 short_desc="LLVM OpenMP Runtime Library"
@@ -12,12 +12,7 @@ maintainer="Andy Weidenbaum <archbaum@gmail.com>"
 license="NCSA"
 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
-}
+checksum=f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
 
 libomp-devel_package() {
 	short_desc+=" - development files"

Re: [PR PATCH] [Updated] [WIP] libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages libomp
https://github.com/void-linux/void-packages/pull/11546

[WIP] libomp: update to 8.0.0.
- [ ] cryfs

A patch file from https://github.com/void-linux/void-packages/pull/11546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libomp-11546.patch --]
[-- Type: application/text/x-diff, Size: 1860 bytes --]

From 4fb4d8588db44bcc659bdc5226f6d656ad711ec7 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 08:48:15 +1000
Subject: [PATCH] libomp: update to 8.0.0.

---
 common/shlibs           |  4 ++++
 srcpkgs/libomp/template | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9857067a1ad..e32ff266047 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,3 +3461,7 @@ libgrpc.so.7 grpc-1.19.1_1
 libgrpc_cronet.so.7 grpc-1.19.1_1
 libgrpc_unsecure.so.7 grpc-1.19.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
+libomp.so libomp-8.0.0_1
+libomptarget.so libomp-8.0.0_1
+libomptarget.rtl.aarch64.so libomp-8.0.0_1
+libomptarget.rtl.x86_64.so libomp-8.0.0_1
diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index de75b12d3df..2247728984c 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,10 +1,10 @@
 # Template file for 'libomp'
 pkgname=libomp
-version=7.0.1
-revision=2
+version=8.0.0
+revision=1
 wrksrc="openmp-${version}.src"
 build_style=cmake
-configure_args="-DLIBOMP_ENABLE_SHARED=ON"
+configure_args="-DLIBOMP_ENABLE_SHARED=ON -DLIBOMP_INSTALL_ALIASES=OFF"
 hostmakedepends="perl pkg-config"
 makedepends="elfutils-devel libffi-devel"
 short_desc="LLVM OpenMP Runtime Library"
@@ -12,12 +12,7 @@ maintainer="Andy Weidenbaum <archbaum@gmail.com>"
 license="NCSA"
 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
-}
+checksum=f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
 
 libomp-devel_package() {
 	short_desc+=" - development files"

Re: [PR PATCH] [Updated] [WIP] libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages libomp
https://github.com/void-linux/void-packages/pull/11546

[WIP] libomp: update to 8.0.0.
- [ ] cryfs

A patch file from https://github.com/void-linux/void-packages/pull/11546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libomp-11546.patch --]
[-- Type: application/text/x-diff, Size: 1860 bytes --]

From 4fb4d8588db44bcc659bdc5226f6d656ad711ec7 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 08:48:15 +1000
Subject: [PATCH] libomp: update to 8.0.0.

---
 common/shlibs           |  4 ++++
 srcpkgs/libomp/template | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9857067a1ad..e32ff266047 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,3 +3461,7 @@ libgrpc.so.7 grpc-1.19.1_1
 libgrpc_cronet.so.7 grpc-1.19.1_1
 libgrpc_unsecure.so.7 grpc-1.19.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
+libomp.so libomp-8.0.0_1
+libomptarget.so libomp-8.0.0_1
+libomptarget.rtl.aarch64.so libomp-8.0.0_1
+libomptarget.rtl.x86_64.so libomp-8.0.0_1
diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index de75b12d3df..2247728984c 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,10 +1,10 @@
 # Template file for 'libomp'
 pkgname=libomp
-version=7.0.1
-revision=2
+version=8.0.0
+revision=1
 wrksrc="openmp-${version}.src"
 build_style=cmake
-configure_args="-DLIBOMP_ENABLE_SHARED=ON"
+configure_args="-DLIBOMP_ENABLE_SHARED=ON -DLIBOMP_INSTALL_ALIASES=OFF"
 hostmakedepends="perl pkg-config"
 makedepends="elfutils-devel libffi-devel"
 short_desc="LLVM OpenMP Runtime Library"
@@ -12,12 +12,7 @@ maintainer="Andy Weidenbaum <archbaum@gmail.com>"
 license="NCSA"
 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
-}
+checksum=f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
 
 libomp-devel_package() {
 	short_desc+=" - development files"

Re: [PR PATCH] [Updated] [WIP] libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages libomp
https://github.com/void-linux/void-packages/pull/11546

[WIP] libomp: update to 8.0.0.
- [ ] cryfs

A patch file from https://github.com/void-linux/void-packages/pull/11546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libomp-11546.patch --]
[-- Type: application/text/x-diff, Size: 2491 bytes --]

From 4fb4d8588db44bcc659bdc5226f6d656ad711ec7 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 08:48:15 +1000
Subject: [PATCH 1/2] libomp: update to 8.0.0.

---
 common/shlibs           |  4 ++++
 srcpkgs/libomp/template | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9857067a1ad..e32ff266047 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,3 +3461,7 @@ libgrpc.so.7 grpc-1.19.1_1
 libgrpc_cronet.so.7 grpc-1.19.1_1
 libgrpc_unsecure.so.7 grpc-1.19.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
+libomp.so libomp-8.0.0_1
+libomptarget.so libomp-8.0.0_1
+libomptarget.rtl.aarch64.so libomp-8.0.0_1
+libomptarget.rtl.x86_64.so libomp-8.0.0_1
diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index de75b12d3df..2247728984c 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,10 +1,10 @@
 # Template file for 'libomp'
 pkgname=libomp
-version=7.0.1
-revision=2
+version=8.0.0
+revision=1
 wrksrc="openmp-${version}.src"
 build_style=cmake
-configure_args="-DLIBOMP_ENABLE_SHARED=ON"
+configure_args="-DLIBOMP_ENABLE_SHARED=ON -DLIBOMP_INSTALL_ALIASES=OFF"
 hostmakedepends="perl pkg-config"
 makedepends="elfutils-devel libffi-devel"
 short_desc="LLVM OpenMP Runtime Library"
@@ -12,12 +12,7 @@ maintainer="Andy Weidenbaum <archbaum@gmail.com>"
 license="NCSA"
 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
-}
+checksum=f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
 
 libomp-devel_package() {
 	short_desc+=" - development files"

From 8ac6aa96cda375b616c6a58ca25d89bb17c3499c Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 09:10:30 +1000
Subject: [PATCH 2/2] cryfs: rebuild for libomp-8.0.0

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index e41d66e1882..a81fb407050 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

Re: [PR PATCH] [Updated] [WIP] libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by atweiden against master on the void-packages repository

https://github.com/atweiden/void-packages libomp
https://github.com/void-linux/void-packages/pull/11546

[WIP] libomp: update to 8.0.0.
- [ ] cryfs

A patch file from https://github.com/void-linux/void-packages/pull/11546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libomp-11546.patch --]
[-- Type: application/text/x-diff, Size: 2491 bytes --]

From 4fb4d8588db44bcc659bdc5226f6d656ad711ec7 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 08:48:15 +1000
Subject: [PATCH 1/2] libomp: update to 8.0.0.

---
 common/shlibs           |  4 ++++
 srcpkgs/libomp/template | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9857067a1ad..e32ff266047 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,3 +3461,7 @@ libgrpc.so.7 grpc-1.19.1_1
 libgrpc_cronet.so.7 grpc-1.19.1_1
 libgrpc_unsecure.so.7 grpc-1.19.1_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
+libomp.so libomp-8.0.0_1
+libomptarget.so libomp-8.0.0_1
+libomptarget.rtl.aarch64.so libomp-8.0.0_1
+libomptarget.rtl.x86_64.so libomp-8.0.0_1
diff --git a/srcpkgs/libomp/template b/srcpkgs/libomp/template
index de75b12d3df..2247728984c 100644
--- a/srcpkgs/libomp/template
+++ b/srcpkgs/libomp/template
@@ -1,10 +1,10 @@
 # Template file for 'libomp'
 pkgname=libomp
-version=7.0.1
-revision=2
+version=8.0.0
+revision=1
 wrksrc="openmp-${version}.src"
 build_style=cmake
-configure_args="-DLIBOMP_ENABLE_SHARED=ON"
+configure_args="-DLIBOMP_ENABLE_SHARED=ON -DLIBOMP_INSTALL_ALIASES=OFF"
 hostmakedepends="perl pkg-config"
 makedepends="elfutils-devel libffi-devel"
 short_desc="LLVM OpenMP Runtime Library"
@@ -12,12 +12,7 @@ maintainer="Andy Weidenbaum <archbaum@gmail.com>"
 license="NCSA"
 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
-}
+checksum=f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5
 
 libomp-devel_package() {
 	short_desc+=" - development files"

From 8ac6aa96cda375b616c6a58ca25d89bb17c3499c Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <archbaum@gmail.com>
Date: Wed, 8 May 2019 09:10:30 +1000
Subject: [PATCH 2/2] cryfs: rebuild for libomp-8.0.0

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index e41d66e1882..a81fb407050 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490454450
Comment:
There is no need to add the shlib entries as nothing links against these libraries.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

New comment by atweiden on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490662705
Comment:
> There is no need to add the shlib entries as nothing links against these libraries.

What about cryfs? https://github.com/void-linux/void-packages/blob/7e9d9ecd5657b6d77036cfb20d11dab30c726786/srcpkgs/cryfs/template#L10?

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by atweiden on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490662705
Comment:
> There is no need to add the shlib entries as nothing links against these libraries.

What about cryfs? https://github.com/void-linux/void-packages/blob/7e9d9ecd5657b6d77036cfb20d11dab30c726786/srcpkgs/cryfs/template#L10

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490668037
Comment:
Not sure what's going on there but cryfs doesn't link against libomp:

```
$ xbps-query -R -p shlib-requires cryfs
libcurl.so.4
libfuse.so.2
libstdc++.so.6
libgcc_s.so.1
libc.so
```

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

New comment by atweiden on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490673636
Comment:
Upstream [notes](https://github.com/cryfs/cryfs/blob/develop/README.md#troubleshooting) not building against omp "will cause slower file system mount times". This was the impetus for adding the libomp package in the first place.

I think cryfs should be linking against libomp.

Maybe something is going wrong because I'm not including the full `-DOpenMP_CXX_FLAGS='-Xpreprocessor -fopenmp -I/path/to/openmp/include'` as recommend by upstream. IIRC, I left out the `-X` and `-f` opts there because of difficulty passing the whitespaced opts during the build.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490895508
Comment:
Is there a reason to use `libomp` instead of `libgomp` with cryfs?
Replacing `libomp-devel` with `libgomp-devel` and removing all the OpenMP specific configure flags works fine.
`libgomp` is the OpenMP implementation of gcc, as we compile with gcc it makes sense to use it.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490944290
Comment:
I guess you would take `libomp` in case the system (or your preferred) compiler is `clang` or another `llvm` based compiler which uses OMP. Since we use `gcc` for most of our packages, we should probably add a `-devel` subpackage, make this package conflict with `libgomp-devel`, and move `/usr/lib/libgomp.so` to the `-devel` package.

In case we are ever forced to built a package linking against this `libomp` with one of the `llvm` base compilers, I think both implementations could coexist in a user's installed files, because they have their own `*.so.*` files.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 713 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490944290
Comment:
I guess you would take `libomp` in case the system (or your preferred) compiler is `clang` or another `llvm` based compiler which uses OMP. Since we use `gcc` for most of our packages, we should probably add a `-devel` subpackage, make this package conflict with `libgomp-devel`, and move `/usr/lib/libgomp.so` to the `-devel` package.

In case we are ever forced to built a package linking against this `libomp` with one of the `llvm` based compilers, I think both implementations could coexist in a user's installed files, because they have their own `*.so.*` files.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 810 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490944290
Comment:
I guess you would take `libomp` in case the system (or your preferred) compiler is `clang` or another `llvm` based compiler which uses OMP. Since we use `gcc` for most of our packages, we should probably add a `-devel` subpackage, make this package conflict with `libgomp-devel`, and move `/usr/lib/libgomp.so` to the `-devel` package.

In case we are ever forced to built a package linking against this `libomp` with one of the `llvm` based compilers, I think both implementations could coexist in a user's installed files, because they have their own `*.so.*` files.

And yes, `cryfs` should probably use `libgomp-devel` because for Void it is built with `gcc`.

Re: libomp: update to 8.0.0.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/11546#issuecomment-490944290
Comment:
I guess you would take `libomp` in case the system (or your preferred) compiler is `clang` or another `llvm` based compiler which uses OMP. Since we use `gcc` for most of our packages, we should probably add a `-devel` subpackage, make this package conflict with `libgomp-devel`, and `vmove /usr/lib/libgomp.so` to the `-devel` package.

In case we are ever forced to built a package linking against this `libomp` with one of the `llvm` based compilers, I think both implementations could coexist in a user's installed files, because they have their own `*.so.*` files.

And yes, `cryfs` should probably use `libgomp-devel` because for Void it is built with `gcc`.