OpenMP integration follow ups

This commit is contained in:
Reshabh Sharma 2018-08-07 17:11:41 +00:00 committed by Sylvestre Ledru
parent cccb1bd7ff
commit ad12a41752
4 changed files with 14 additions and 7 deletions

4
debian/changelog vendored
View File

@ -25,6 +25,10 @@ llvm-toolchain-snapshot (1:7~svn336894-1~exp1) experimental; urgency=medium
[ Gianfranco Costamagna ] [ Gianfranco Costamagna ]
* Bump std-version to 4.1.5, no changes required * Bump std-version to 4.1.5, no changes required
[ Reshabh Sharma ]
* Updated debian/control with breaks, provides and conflicts for OpenMP
packages (Closes: #903802)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 09 May 2018 14:23:49 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Wed, 09 May 2018 14:23:49 +0200
llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium

14
debian/control vendored
View File

@ -483,8 +483,9 @@ Section: libdevel
Architecture: any Architecture: any
Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-7-doc Suggests: libomp-7-doc
Replaces: libiomp-7-dev (<< 3.7-1) Replaces: libiomp-dev (<< 3.7-1), libomp-dev
Breaks: libiomp-7-dev (<< 3.7-1) Breaks: libiomp-dev (<< 3.7-1), libomp-dev
Provides: libomp-dev
Description: LLVM OpenMP runtime - dev package Description: LLVM OpenMP runtime - dev package
The runtime is the part of the OpenMP implementation that your code is The runtime is the part of the OpenMP implementation that your code is
linked against, and that manages the multiple threads in an OpenMP program linked against, and that manages the multiple threads in an OpenMP program
@ -494,8 +495,9 @@ Package: libomp5-7
Multi-Arch: same Multi-Arch: same
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libiomp5-7 (<< 3.7-1) Replaces: libomp5
Breaks: libiomp5-7 (<< 3.7-1) Breaks: libomp5
Provides: libomp5
# TODO add the break depends # TODO add the break depends
Description: LLVM OpenMP runtime Description: LLVM OpenMP runtime
The runtime is the part of the OpenMP implementation that your code is The runtime is the part of the OpenMP implementation that your code is
@ -506,8 +508,8 @@ Package: libomp-7-doc
Section: doc Section: doc
Architecture: all Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
Replaces: libiomp-7-doc (<< 3.7-1) Replaces: libiomp-doc
Breaks: libiomp-7-doc (<< 3.7-1) Breaks: libiomp-doc
Description: LLVM OpenMP runtime - Documentation Description: LLVM OpenMP runtime - Documentation
The runtime is the part of the OpenMP implementation that your code is The runtime is the part of the OpenMP implementation that your code is
linked against, and that manages the multiple threads in an OpenMP program linked against, and that manages the multiple threads in an OpenMP program

1
debian/libomp-X.Y.links.in vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5

View File

@ -1 +1 @@
libomp5-@LLVM_VERSION@: postinst-must-call-ldconfig usr/lib/*/libomp-@LLVM_VERSION@.so.5 libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5