diff -Nru llvm-toolchain-6.0-6.0.1/debian/changelog llvm-toolchain-6.0-6.0.1/debian/changelog --- llvm-toolchain-6.0-6.0.1/debian/changelog 2020-05-15 16:25:16.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/changelog 2020-05-21 12:51:47.000000000 +0000 @@ -1,3 +1,38 @@ +llvm-toolchain-6.0 (1:6.0.1-14.1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + + [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green] + * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake + * Clean up debian/usr in clean target. + * Clean up clang/tools/*-3.9 in clean target. + * Clean up stray *3.9.vim files + * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc + * Clean up debian/*.install + + [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green] + * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain + about it not existing. + * clean up more crap left behind by build process. + * Put commented out (by Debian not us) ocaml build-depends into build-conflicts + if they are installed it seems that the package builds the ocaml stuff and + then errors out during packaging because it's not installed to anywhere. + + [changes introduced in 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + + [changes introduced in 1:6.0.1-14+rpi1 by Peter Michael Green] + * Clean up yet more crap in clean target. + + -- Raspbian forward porter Thu, 21 May 2020 12:51:47 +0000 + llvm-toolchain-6.0 (1:6.0.1-14.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru llvm-toolchain-6.0-6.0.1/debian/control llvm-toolchain-6.0-6.0.1/debian/control --- llvm-toolchain-6.0-6.0.1/debian/control 2020-05-15 16:25:13.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/control 2020-05-21 12:51:47.000000000 +0000 @@ -15,7 +15,7 @@ # ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x], # libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], # dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, ocaml-nox, ocaml-findlib, libctypes-ocaml-dev, dh-ocaml Standards-Version: 4.2.0 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 6.0 diff -Nru llvm-toolchain-6.0-6.0.1/debian/morecraptoremove llvm-toolchain-6.0-6.0.1/debian/morecraptoremove --- llvm-toolchain-6.0-6.0.1/debian/morecraptoremove 1970-01-01 00:00:00.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/morecraptoremove 2020-05-21 12:51:47.000000000 +0000 @@ -0,0 +1,77 @@ +clang/tools/scan-build-6.0/CMakeLists.txt +clang/tools/scan-build-6.0/bin/scan-build +clang/tools/scan-build-6.0/bin/scan-build.bat +clang/tools/scan-build-6.0/bin/set-xcode-analyzer +clang/tools/scan-build-6.0/libexec/c++-analyzer +clang/tools/scan-build-6.0/libexec/c++-analyzer.bat +clang/tools/scan-build-6.0/libexec/ccc-analyzer +clang/tools/scan-build-6.0/libexec/ccc-analyzer.bat +clang/tools/scan-build-6.0/man/scan-build-6.0.1 +clang/tools/scan-build-6.0/man/scan-build.1 +clang/tools/scan-build-6.0/share/scan-build/scanview.css +clang/tools/scan-build-6.0/share/scan-build/sorttable.js +clang/tools/scan-build-py-6.0/README.md +clang/tools/scan-build-py-6.0/bin/analyze-build +clang/tools/scan-build-py-6.0/bin/analyze-c++ +clang/tools/scan-build-py-6.0/bin/analyze-cc +clang/tools/scan-build-py-6.0/bin/intercept-build +clang/tools/scan-build-py-6.0/bin/intercept-c++ +clang/tools/scan-build-py-6.0/bin/intercept-cc +clang/tools/scan-build-py-6.0/bin/scan-build +clang/tools/scan-build-py-6.0/libear/__init__.py +clang/tools/scan-build-py-6.0/libear/config.h.in +clang/tools/scan-build-py-6.0/libear/ear.c +clang/tools/scan-build-py-6.0/libscanbuild/__init__.py +clang/tools/scan-build-py-6.0/libscanbuild/analyze.py +clang/tools/scan-build-py-6.0/libscanbuild/arguments.py +clang/tools/scan-build-py-6.0/libscanbuild/clang.py +clang/tools/scan-build-py-6.0/libscanbuild/compilation.py +clang/tools/scan-build-py-6.0/libscanbuild/intercept.py +clang/tools/scan-build-py-6.0/libscanbuild/report.py +clang/tools/scan-build-py-6.0/libscanbuild/resources/scanview.css +clang/tools/scan-build-py-6.0/libscanbuild/resources/selectable.js +clang/tools/scan-build-py-6.0/libscanbuild/resources/sorttable.js +clang/tools/scan-build-py-6.0/libscanbuild/shell.py +clang/tools/scan-build-py-6.0/tests/__init__.py +clang/tools/scan-build-py-6.0/tests/functional/cases/__init__.py +clang/tools/scan-build-py-6.0/tests/functional/cases/test_create_cdb.py +clang/tools/scan-build-py-6.0/tests/functional/cases/test_exec_anatomy.py +clang/tools/scan-build-py-6.0/tests/functional/cases/test_from_cdb.py +clang/tools/scan-build-py-6.0/tests/functional/cases/test_from_cmd.py +clang/tools/scan-build-py-6.0/tests/functional/exec/CMakeLists.txt +clang/tools/scan-build-py-6.0/tests/functional/exec/config.h.in +clang/tools/scan-build-py-6.0/tests/functional/exec/main.c +clang/tools/scan-build-py-6.0/tests/functional/src/broken-one.c +clang/tools/scan-build-py-6.0/tests/functional/src/broken-two.c +clang/tools/scan-build-py-6.0/tests/functional/src/build/Makefile +clang/tools/scan-build-py-6.0/tests/functional/src/clean-one.c +clang/tools/scan-build-py-6.0/tests/functional/src/clean-two.c +clang/tools/scan-build-py-6.0/tests/functional/src/compilation_database/build_broken.json.in +clang/tools/scan-build-py-6.0/tests/functional/src/compilation_database/build_clean.json.in +clang/tools/scan-build-py-6.0/tests/functional/src/compilation_database/build_regular.json.in +clang/tools/scan-build-py-6.0/tests/functional/src/emit-one.c +clang/tools/scan-build-py-6.0/tests/functional/src/emit-two.c +clang/tools/scan-build-py-6.0/tests/functional/src/include/clean-one.h +clang/tools/scan-build-py-6.0/tests/functional/src/main.c +clang/tools/scan-build-py-6.0/tests/unit/__init__.py +clang/tools/scan-build-py-6.0/tests/unit/test_analyze.py +clang/tools/scan-build-py-6.0/tests/unit/test_clang.py +clang/tools/scan-build-py-6.0/tests/unit/test_compilation.py +clang/tools/scan-build-py-6.0/tests/unit/test_intercept.py +clang/tools/scan-build-py-6.0/tests/unit/test_libear.py +clang/tools/scan-build-py-6.0/tests/unit/test_report.py +clang/tools/scan-build-py-6.0/tests/unit/test_shell.py +clang/tools/scan-build/man/scan-build-6.0.1 +clang/tools/scan-view-6.0/CMakeLists.txt +clang/tools/scan-view-6.0/bin/scan-view +clang/tools/scan-view-6.0/share/Reporter.py +clang/tools/scan-view-6.0/share/ScanView.py +clang/tools/scan-view-6.0/share/startfile.py +utils/vim/ftdetect/llvm-6.0.vim +utils/vim/ftdetect/tablegen-6.0.vim +utils/vim/ftplugin/llvm-6.0.vim +utils/vim/ftplugin/tablegen-6.0.vim +utils/vim/indent/llvm-6.0.vim +utils/vim/llvm-6.0-vimrc +utils/vim/syntax/llvm-6.0.vim +utils/vim/syntax/tablegen-6.0.vim diff -Nru llvm-toolchain-6.0-6.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 llvm-toolchain-6.0-6.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 --- llvm-toolchain-6.0-6.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 1970-01-01 00:00:00.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 2020-05-21 12:51:47.000000000 +0000 @@ -0,0 +1,61 @@ +From: Peter Micahel Green +Subject: Automatically generated patch (1:5.0~+rc2-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit d8bb5e17a1c124bfc65bd4da3d5bad2318b86155 +Author: Peter Michael Green +Date: Thu Sep 7 07:03:48 2017 +0000 + + Remove old cmake patch, dgit will regenerate it. + +commit 8479377cb2739eeaa610fbc0370f239e0cabda83 +Merge: 706ae0030 46e6d900f +Author: Peter Michael Green +Date: Thu Sep 7 07:11:20 2017 +0100 + + Merge raspbian changes from llvm-toolchain-4.0 + +commit 706ae0030c98b01e6594ab4a4aca848e9dbedbd5 +Merge: 2b80ff9a0 b60f1e5d8 +Author: plugwash +Date: Thu Sep 7 07:02:37 2017 +0100 + + Psuedomerge to tie in 4.0 history. +--- + +Index: llvm-toolchain-6.0-6.0/cmake/config.guess.hack +=================================================================== +--- /dev/null ++++ llvm-toolchain-6.0-6.0/cmake/config.guess.hack +@@ -0,0 +1,2 @@ ++#!/bin/bash -e ++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ +Index: llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake +=================================================================== +--- llvm-toolchain-6.0-6.0.orig/cmake/modules/GetHostTriple.cmake ++++ llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake +@@ -15,7 +15,7 @@ function( get_host_triple var ) + set( value "i686-pc-mingw32" ) + endif() + else( MSVC ) +- set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) ++ set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack) + execute_process(COMMAND sh ${config_guess} + RESULT_VARIABLE TT_RV + OUTPUT_VARIABLE TT_OUT +Index: llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake +=================================================================== +--- llvm-toolchain-6.0-6.0.orig/compiler-rt/cmake/base-config-ix.cmake ++++ llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake +@@ -178,8 +178,8 @@ macro(test_targets) + if(WIN32) + test_target_arch(arm "" "" "") + else() +- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") +- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") ++ test_target_arch(arm "" "" "-mfloat-abi=soft") ++ test_target_arch(armhf "" "" "-mfloat-abi=hard") + test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft") + endif() + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") diff -Nru llvm-toolchain-6.0-6.0.1/debian/patches/series llvm-toolchain-6.0-6.0.1/debian/patches/series --- llvm-toolchain-6.0-6.0.1/debian/patches/series 2020-03-23 10:18:06.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/patches/series 2020-05-21 12:51:47.000000000 +0000 @@ -95,3 +95,4 @@ # [bug fix] llvm-rL323946-LSRTy # Already applied before 947f9692440836dcb8d88b74b69dd379d85974ce.patch +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 diff -Nru llvm-toolchain-6.0-6.0.1/debian/rules llvm-toolchain-6.0-6.0.1/debian/rules --- llvm-toolchain-6.0-6.0.1/debian/rules 2020-05-15 16:25:13.000000000 +0000 +++ llvm-toolchain-6.0-6.0.1/debian/rules 2020-05-21 12:51:47.000000000 +0000 @@ -35,7 +35,7 @@ LDFLAGS_EXTRA = CXXFLAGS_EXTRA = -std=c++0x CONFIGURE_EXTRA = -CMAKE_EXTRA = +CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) LDFLAGS_EXTRA += -latomic @@ -186,6 +186,12 @@ preconfigure: + # add executable flag to script we added as part of triplet hack + # --plugwash + chmod 755 cmake/config.guess.hack + # also make sure config.guess is executable + chmod 755 cmake/config.guess + for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \ @@ -347,6 +353,7 @@ done override_dh_auto_install: + mkdir -p build-llvm/docs/ocamldoc/html/ # Clean up temporary files to make sure the install works rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d) # install/fast enables a make install without recompiling temporary files @@ -537,7 +544,7 @@ # Remove auto generated python pyc find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f -ifeq (${RUN_TEST},yes) +ifeq (false,true) # List of the archs we know we have 100 % tests working ARCH_LLVM_TEST_OK := i386 amd64 @@ -602,6 +609,9 @@ genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \ fi override_dh_auto_test: +else +override_dh_auto_test: + echo testsuite disabled endif @@ -624,6 +634,17 @@ rm -f $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION) rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py - + rm -f `find . -name '*.pyc'` + rm -rf debian/usr + rm -rf clang/tools/*-3.9 + rm -f `find . -name '*3.9.vim'` + rm -f clang/tools/scan-build/man/scan-build-3.9.1 utils/vim/llvm-3.9-vimrc + rm -f debian/*.install + rm -f clang/tools/scan-view-6.0/share/FileRadar.scpt clang/tools/scan-view-6.0/share/bugcatcher.ico + rm -f `cat debian/morecraptoremove` + rm -rf debian/man + rm -f debian/*.docs debian/*.examples debian/*.manpages debian/*.links debian/*.symbols debian/*.META debian/*.postinst debian/*.binfmt debian/*.prerm + rm -f debian/clang-6.0.lintian-overrides debian/clang-format-6.0.lintian-overrides debian/clang-tidy-6.0.lintian-overrides debian/clang-tools-6.0.lintian-overrides debian/libclang1-6.0.lintian-overrides debian/liblldb-6.0.lintian-overrides debian/libllvm-6.0-ocaml-dev.lintian-overrides debian/libllvm6.0.lintian-overrides debian/lldb-6.0.lintian-overrides debian/llvm-6.0-runtime.lintian-overrides debian/llvm-6.0.lintian-overrides + rm -f debian/libllvm-6.0-ocaml-dev.dirs debian/llvm-6.0-examples.dirs debian/llvm-6.0-dev.dirs debian/llvm-6.0-tools.dirs debian/llvm-6.0.dirs debian/llvm-6.0-doc.dirs .PHONY: override_dh_strip preconfigure