proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-03 08:51:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix new openmp patch overwritting previous openmp-soname patch

Browse Source 
remove `debian/rules` libomp file `mv` on install due to patch fix
This commit is contained in:
Erik Maciejewski 2021-10-01 14:02:11 -07:00
parent 7377580543
commit 11a0af3898
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/openmp-fix-runtimes-build.diff vendored
View File

@ -127,16 +127,6 @@ Index: llvm-toolchain-12_12.0.1/openmp/runtime/CMakeLists.txt
# Shared library can be switched to a static library
set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
"Shared library instead of static library?")
@@ -358,8 +362,7 @@ else()
set(LIBOMP_INSTALL_KIND ARCHIVE)
endif()
-set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBOMP_VERSION_MAJOR})
-
+set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX})
# Optional backwards compatibility aliases.
set(LIBOMP_INSTALL_ALIASES TRUE CACHE BOOL
Index: llvm-toolchain-12_12.0.1/openmp/runtime/src/CMakeLists.txt
===================================================================
--- llvm-toolchain-12_12.0.1.orig/openmp/runtime/src/CMakeLists.txt

2
debian/rules vendored
View File

@ -667,7 +667,7 @@ override_dh_auto_install:
: # libomp
if test "$(OPENMP_ENABLE)" = yes; then \
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && mv libomp.so libomp.so.$(SONAME_OPENMP); \
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so; \
cp libomp.so.$(SONAME_OPENMP) libomp-$(LLVM_VERSION).so.$(SONAME_OPENMP); \
fi