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

Merge branch '7' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 7

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-09-06 15:39:26 +02:00
commit 8a2b426031
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
llvm-toolchain-7 (1:7~+rc2-1~exp4) UNRELEASED; urgency=medium
[ John Paul Adrian Glaubitz ]
* Disable OpenMP on unsupported architectures powerpc,
powerpcspe, riscv64 and sparc64 (Closes: #907912)
-- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Tue, 04 Sep 2018 10:20:57 +0200
llvm-toolchain-7 (1:7~+rc2-1~exp3) experimental; urgency=medium llvm-toolchain-7 (1:7~+rc2-1~exp3) experimental; urgency=medium
* Remove libtool flex, bison, dejagnu, tcl, expect, * Remove libtool flex, bison, dejagnu, tcl, expect,

41
debian/rules vendored
View File

@ -111,6 +111,12 @@ ifeq (,$(filter-out $(DEB_HOST_ARCH), powerpc powerpcspe s390x))
POLLY_ENABLE=no POLLY_ENABLE=no
endif endif
# Enable openmp (or not)
OPENMP_ENABLE=yes
ifeq (,$(filter-out $(DEB_HOST_ARCH), powerpc powerpcspe riscv64 sparc64 s390x))
OPENMP_ENABLE=no
endif
RUN_TEST=yes RUN_TEST=yes
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
RUN_TEST=no RUN_TEST=no
@ -262,14 +268,14 @@ override_dh_auto_configure: preconfigure
ln -s ../compiler-rt .; \ ln -s ../compiler-rt .; \
readlink compiler-rt readlink compiler-rt
ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) if test "$(OPENMP_ENABLE)" = yes; then \
cd projects/ && \ cd projects/ && \
if test -h openmp; then \ if test -h openmp; then \
rm openmp; \ rm openmp; \
fi; \ fi; \
ln -s ../openmp .; \ ln -s ../openmp .; \
readlink openmp readlink openmp; \
endif fi
# Configure coverity (we need the compilers) + work around perf issues # Configure coverity (we need the compilers) + work around perf issues
-(if test $(COVERITY_ENABLE) -eq 1; then \ -(if test $(COVERITY_ENABLE) -eq 1; then \
@ -428,10 +434,10 @@ build_doc:
echo "Generating manpage of $$f"; \ echo "Generating manpage of $$f"; \
LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
done done
ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) if test "$(OPENMP_ENABLE)" = yes; then \
cd openmp/runtime && doxygen doc/doxygen/config cd openmp/runtime && doxygen doc/doxygen/config; \
cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js; \
endif fi
override_dh_auto_install: override_dh_auto_install:
# Clean up temporary files to make sure the install works # Clean up temporary files to make sure the install works
@ -446,7 +452,7 @@ override_dh_auto_install:
# Only run on executable, not script # Only run on executable, not script
chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1`
chrpath -d libcxxabi/build/lib/libc++abi.so.1.0 chrpath -d libcxxabi/build/lib/libc++abi.so.1.0
chrpath -d libcxx/build/lib/libc++.so.1.0 chrpath -d libcxx/build/lib/libc++.so.1.0
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \
@ -455,11 +461,10 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so ln -s libomp.so.$(SONAME_OPENMP) libomp.so
if test "$(OPENMP_ENABLE)" = yes; then \
ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp cp -f openmp/runtime/exports/common*/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
cp -f openmp/runtime/exports/common*/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp fi
endif
# Remove artifact (where compiler-rt is built) # Remove artifact (where compiler-rt is built)
# if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \ # if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \