proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-23 20:16:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Add override_dh_makeshlibs for the libllvm or liblldb versions

Browse Source 
Thanks to Julien Cristau for the patch
* Bring back the ocaml binding. thanks to Cyril Soldani for the patch
  (Closes: #858626)
* change the min version of the libclang1 symbols to 1:4.0-3~
* Add override_dh_makeshlibs for the libllvm or liblldb versions
  Thanks to Julien Cristau for the patch
* Fix the symlink on scan-build-py
* Bring back the content of llvm-4.0-doc (Closes: #844616)
* d/p/pthread-link.diff Hardcode like to pthread which was missing for
  libclang
This commit is contained in:
Sylvestre Ledru 2017-04-09 08:28:04 +00:00
commit 8bb58ffa7a
8 changed files with 778 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/changelog vendored
View File

@ -1,17 +1,20 @@
llvm-toolchain-snapshot (1:5.0~svn298832-1~exp1) experimental; urgency=medium
* New snapshot release
* Explicit the dep of clang-tidy on same version of llvm to avoid
undefined symbols
* d/p/silent-amd-tet.diff: Silent some amdgpu test
https://bugs.llvm.org//show_bug.cgi?id=32483
* d/p/disable-error-xray.diff: silent some xray error. See
https://bugs.llvm.org/show_bug.cgi?id=32582
* Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch
* Bring back the ocaml binding. thanks to Cyril Soldani for the patch
(Closes: #858626)
* change the min version of the libclang1 symbols to 1:4.0-3~
* Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch
* Fix the symlink on scan-build-py
[ Rebecca N. Palmer ]
* Use versioned symbols (Closes: #848368)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 27 Mar 2017 09:15:16 +0200
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 09 Apr 2017 10:11:56 +0200
llvm-toolchain-snapshot (1:5.0~svn294583-1~exp1) experimental; urgency=medium
@ -32,6 +35,9 @@ llvm-toolchain-snapshot (1:5.0~svn292017-1~exp1) experimental; urgency=medium
* d/p/lldb-server-link-issue.patch removed, merged upstream
* Also install python-lldb-5.0 when installing lldb-5.0 (Closes: #851171)
* Bring back the content of llvm-5.0-doc (Closes: #844616)
* Bring back the content of llvm-4.0-doc (Closes: #844616)
* d/p/pthread-link.diff Hardcode like to pthread which was missing for
libclang
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 14 Jan 2017 16:36:51 +0100

2
debian/clang-X.Y.links.in vendored
View File

@ -1,4 +1,4 @@
usr/share/clang/scan-build-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-@LLVM_VERSION@
usr/share/clang/scan-build-py-@LLVM_VERSION@/bin/scan-build-py usr/bin/scan-build-@LLVM_VERSION@-py
usr/share/clang/scan-build-py-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-py-@LLVM_VERSION@
usr/share/clang/scan-view-@LLVM_VERSION@/bin/scan-view usr/bin/scan-view-@LLVM_VERSION@

1024
debian/libclang1-X.Y.symbols.in vendored
View File

File diff suppressed because it is too large Load Diff

2
debian/liblldb-X.Y-dev.links.in vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so

4
debian/libllvm-X.Y-ocaml-dev.install.in vendored
View File

@ -1,2 +1,2 @@
#@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/
@OCAML_STDLIB_DIR@/llvm-@LLVM_VERSION@ @OCAML_STDLIB_DIR@/
usr/lib/llvm-@LLVM_VERSION@/docs/ocaml/html/html usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/

18
debian/patches/pthread-link.diff vendored Normal file
View File

@ -0,0 +1,18 @@
Index: llvm-toolchain-4.0-4.0~svn292009/clang/tools/libclang/CMakeLists.txt
1;4601;0c===================================================================
--- llvm-toolchain-4.0-4.0~svn292009.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-4.0-4.0~svn292009/clang/tools/libclang/CMakeLists.txt
@@ -56,6 +56,13 @@ endif ()
find_library(DL_LIBRARY_PATH dl)
if (DL_LIBRARY_PATH)
list(APPEND LIBS dl)
+
+endif()
+if (PTHREAD_LIB)
+ # libpthreads overrides some standard library symbols, so main
+ # executable must be linked with it in order to provide consistent
+ # API for all shared libaries loaded by this executable.
+ list(APPEND LIBS ${PTHREAD_LIB})
endif()
option(LIBCLANG_BUILD_STATIC

46
debian/patches/silent-amdgpu-test-failing.diff vendored Normal file
View File

@ -0,0 +1,46 @@
Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
===================================================================
--- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
+++ llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
@@ -2,5 +2,6 @@
; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] }
+; XFAIL: *
!opencl.ocl.version = !{}
Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
===================================================================
--- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
+++ llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
@@ -2,6 +2,7 @@
; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] }
+; XFAIL: *
!opencl.ocl.version = !{!0}
!0 = !{}
Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
===================================================================
--- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
+++ llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
@@ -2,6 +2,7 @@
; check llc does not crash for invalid opencl version metadata
; CHECK: { amd.MDVersion: [ 2, 0 ] }
+; XFAIL: *
!opencl.ocl.version = !{!0}
!0 = !{i32 1}
Index: llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/runtime-metadata.ll
===================================================================
--- llvm-toolchain-snapshot_5.0~svn292012.orig/test/CodeGen/AMDGPU/runtime-metadata.ll
+++ llvm-toolchain-snapshot_5.0~svn292012/test/CodeGen/AMDGPU/runtime-metadata.ll
@@ -1,5 +1,6 @@
; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -o - < %s | llvm-readobj -amdgpu-runtime-metadata | FileCheck %s
; RUN: llc -mtriple=amdgcn--amdhsa -filetype=obj -amdgpu-dump-rtmd -amdgpu-check-rtmd-parser %s -o - 2>&1 | FileCheck --check-prefix=CHECK --check-prefix=PARSER %s
+; XFAIL: *
%struct.A = type { i8, float }
%opencl.image1d_t = type opaque

15
debian/rules vendored
View File

@ -150,8 +150,8 @@ preconfigure:
f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
echo "$$f => $$f2"; \
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
done
@ -272,6 +272,7 @@ override_dh_prep: build_doc
build_doc:
cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
$(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc
# Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old
-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
@ -420,14 +421,24 @@ override_dh_auto_install:
cp -R $(TARGET_BUILD)/tools/clang/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/
cp -R $(TARGET_BUILD)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra
# Rename OCaml bindings
if test -d "$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml"; then \
mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \
mv -f "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml" \
"$(DEB_INST)$(OCAML_STDLIB_DIR)/llvm-$(LLVM_VERSION)"; \
fi
# Delete the target build directory to save some space on the build systems
# All the files have been installed in $(CURDIR)/debian/tmp/ already
rm -rf $(TARGET_BUILD)
override_dh_makeshlibs:
dh_makeshlibs -V1:5.0~svn298832-1~
override_dh_shlibdeps:
# Ignore asan libraries. They would trigger dependencies to multiarch libraries
dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan
dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
override_dh_installman:
dh_installman