Commit 19b9f600 authored by Gianfranco Costamagna's avatar Gianfranco Costamagna

Grab OpenMP fixes for armhf and s390x from 7 branch

parent be21f490
......@@ -481,7 +481,7 @@ Description: Next generation, high-performance debugger, header files
Package: libomp-8-dev
Section: libdevel
Architecture: any
Architecture: amd64 arm64 armhf armel i386 mips mipsel mips64el ppc64el ppc64
Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-8-doc
Replaces: libiomp-dev (<< 3.8-1), libomp-dev
......@@ -494,7 +494,7 @@ Description: LLVM OpenMP runtime - dev package
Package: libomp5-8
Multi-Arch: same
Architecture: any
Architecture: amd64 arm64 armhf armel i386 mips mipsel mips64el ppc64el ppc64
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libomp5 (<< 7~+rc1-1~exp1)
Breaks: libomp5 (<< 7~+rc1-1~exp1)
......
......@@ -262,12 +262,14 @@ override_dh_auto_configure: preconfigure
ln -s ../compiler-rt .; \
readlink compiler-rt
ifeq (,$(filter $(DEB_HOST_ARCH), s390x))
cd projects/ && \
if test -h openmp; then \
rm openmp; \
fi; \
ln -s ../openmp .; \
readlink openmp
endif
# Configure coverity (we need the compilers) + work around perf issues
-(if test $(COVERITY_ENABLE) -eq 1; then \
......@@ -426,8 +428,10 @@ build_doc:
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; \
done
ifeq (,$(filter $(DEB_HOST_ARCH), s390x))
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
endif
override_dh_auto_install:
# Clean up temporary files to make sure the install works
......@@ -451,8 +455,11 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so
ifeq (,$(filter $(DEB_HOST_ARCH), s390x))
mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp
cp openmp/runtime/exports/common.dia.50.ompt.optional/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
endif
# Remove artifact (where compiler-rt is built)
# if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment