Manual merge of version 1:14.0.6-2+rpi1 and 1:14.0.6-8 to produce 1:14.0.6-8+rpi1 archive/raspbian/1%14.0.6-8+rpi1 raspbian/1%14.0.6-8+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Tue, 29 Nov 2022 02:22:11 +0000 (02:22 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Tue, 29 Nov 2022 02:22:11 +0000 (02:22 +0000)
1  2 
debian/changelog
debian/control
debian/patches/series
debian/rules

index a5c1fcd1b91fd17c3c025cd2238d03606fba59da,43eecfa53c96765e100c0621ddada65bb1bbae95..94306765a0364ab894cd466c4b651d4793a8d401
- llvm-toolchain-14 (1:14.0.6-2+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-14 (1:14.0.6-8+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Jul 2022 04:23:14 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 29 Nov 2022 02:21:24 +0000
++
+ llvm-toolchain-14 (1:14.0.6-8) unstable; urgency=medium
+   * Fix the lldb swig issues (closes: #1023444)
+   * Enable LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO to help with caching
+   * Adjust to protobuf 3.21 (Closes: #1023533)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 04 Nov 2022 19:36:56 +0100
+ llvm-toolchain-14 (1:14.0.6-7) unstable; urgency=medium
+   * Disable the cmake search for all binaries
+     (cmake_import_check_files_for.*/bin/). Dunno why it regressed
+     but we wasted too much time on this.
+   * disable sccache on bionic
+   [ Jordan Justen ]
+   * d/rules: Call bash to use 'command -v' to location llvm-spirv executable
+   * d/rules: Set LLVM_SPIRV with cmake for libclc
+   * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV
+   * d/rules: Check for llvm-spirv with version suffix
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 27 Oct 2022 12:47:19 +0200
+ llvm-toolchain-14 (1:14.0.6-6) unstable; urgency=medium
+   * Unbreak the cmake detection (Closes: #1021857, #1022414)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Oct 2022 16:07:45 +0200
+ llvm-toolchain-14 (1:14.0.6-5) unstable; urgency=medium
+   * Update of the build dep llvm-spirv => llvm-spirv-14
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 11 Oct 2022 08:39:18 +0200
+ llvm-toolchain-14 (1:14.0.6-4) unstable; urgency=medium
+   * fix the cmake detection with libmlir
+   * Don't build wasm target on arm64 armel mips64el mipsel ppc64el armhf
+     for now
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 10 Oct 2022 13:47:25 +0200
+ llvm-toolchain-14 (1:14.0.6-3) unstable; urgency=medium
+   * Fix a typo to silent lintian (Closes: #1018770)
+   * Fix some hardcoded paths (Closes: #1020847)
+   * Suggest wasi-libc for clang
+   [ Witold Baryluk ]
+   * Allow libunwind-dev to be coinstallable (Closes: #1004112)
+   [ Faidon Liambotis ]
+   * Add better support for the WebAssembly (wasm32/wasm64) targets:
+     - Ship compiler-rt for the wasm32 and wasm64 targets. (Closes: #1010932)
+     - Add patch wasm-compiler-rt-default.diff to default to compiler-rt for
+       these targets. libgcc does not currently exist for WebAssembly in neither
+       Debian nor upstream, and therefore compiler-rt is the only option.
+     - Add patch wasm-sysroot-usr.diff to support a system-installed (i.e. shipped
+       in /usr) wasi-libc. (Closes: #1020746)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 Aug 2022 16:10:33 +0200
  
  llvm-toolchain-14 (1:14.0.6-2) unstable; urgency=medium
  
diff --cc debian/control
index ab6f78fb27d643efd380f2bddf906ed2b87e9c77,58f91da285e39d81a6fe208c228ec20846a0ba8d..40b89d28ce74a72220b3cea92f517bc9e0e97457
@@@ -18,10 -18,12 +18,11 @@@ Build-Depends: debhelper (>= 10.0), cma
      libjs-mathjax, python3-recommonmark,
      doxygen, gfortran,
      ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
 -    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
 +    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
 +    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
 +    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 -    spirv-tools [ linux-any ] | hello [ !i386],
+     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
      libcurl4-dev,
      libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
      protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
index 32dc7226ef65919a89d26348080d18a434e1e6b6,b3563d7831ba4f7dcbc0266387337ca622c56e02..06f93f7144a145979c3f1fcfe3534207f8c45bdf
@@@ -17,16 -17,19 +15,15 @@@ symbolizer-path.dif
  clang-tidy-run-bin.diff
  0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
  debug-jit-path.diff
 -
  # commented because of bug 903709
  #force-gcc-header-obj.diff
 -
  do-not-fail-on-unexpected-pass.diff
  disable-display-PASS-UNSUPPORTED-XFAIL.diff
--
  # Lib names
  0044-soname.diff
- lldb-soname.diff
+ lldb/lldb-soname.diff
  #lldb-libname.diff
  openmp-soname.diff
 -
  # Disable some tests
  silent-gold-test.diff
  silent-more-tests.diff
@@@ -62,6 -71,10 +59,9 @@@ libcxx/libcxxabi-arm-ehabi-fix.patc
  libcxx/libcxx-silent-test-libcxx.diff
  libcxx/libcxx-silent-failure-ppc64el.diff
  libcxx/libcxx-silent-failure-arm64.diff
 -
+ libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff
+ libcxx/libcxxabi-fix-link-builtins.diff
+ libcxx/libcxx-armhf-ftbfs.diff
  # Change default optims
  mips/mips-fpxx-enable.diff
  mips/mips-force-nomadd4.patch
@@@ -103,28 -124,39 +103,32 @@@ D98575.patc
  # bug 939472
  #try-to-unbreak-thinlto.diff
  #D67877-cmake-clang-example.patch
 -
  x86-fuzzer.patch
 -
  python3-shebang.patch
- print-lldb-path.patch
- libcxx-armhf-ftbfs.diff
+ lldb/print-lldb-path.patch
  lower-python-dep.diff
  scan-build-py-fix-default-bin.diff
- libclc-llvm-spirv.diff
 -
  omp-riscv64.patch
- test-disable-lldb-i386.diff
lldb/test-disable-lldb-i386.diff
  unbreak-atomic-mips.diff
  llvm-fix-lld-linker-check.diff
- compilerrt-fix-warn-xray-testing.diff
  openmp-fix-runtimes-build.diff
  libclc-fix-prepare_builtins-rpath.diff
- libcxx-libatomic-only-with-gcc-rtlib.diff
- libcxxabi-fix-link-builtins.diff
  llvm-runtimes-builtins-build-check.diff
- compilerrt-builtins-arch-fix-armhf.diff
- compilerrt-build-scudo-standalone-option.diff
- wasm-ld-path.diff
  python3-scan-build.py
 -
+ # compiler-rt
+ compiler-rt/compilerrt-fix-warn-xray-testing.diff
+ compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
+ compiler-rt/compilerrt-build-scudo-standalone-option.diff
 -
 -
+ # wasm patches
+ wasm/wasm-ld-path.diff
+ wasm/wasm-compiler-rt-default.diff
+ wasm/wasm-sysroot-usr.diff
 -
  revert-update-doc.diff
  fix-typo.diff
  ubuntu-kinetic.patch
+ fix-typo-1018770.diff
+ lldb/lldb-swig.diff
+ lldb/lldb-swig-2.diff
+ protobuf_3.21.patch
 +raspbian-triplet.patch
diff --cc debian/rules
index d73421571b587c1c04faef94aa9cbf2d4301b17d,483cffdaf793a903ed4e97375c13a5578025c442..7e281503f19469505276d58ea7b576499aec7b19
@@@ -1112,19 -1190,7 +1204,20 @@@ override_dh_auto_clean
        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 -rf libclc/build
 +      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-7.0/share/FileRadar.scpt clang/tools/scan-view-7.0/share/bugcatcher.ico
 +      rm -f `cat debian/morecraptoremove`
 +      rm -rf debian/man
 +      rm -f debian/*.links debian/c*.lintian-overrides debian/l*.lintian-overrides debian/*.META debian/*.dirs debian/*.docs debian/*.symbols debian/*.postinst debian/*.manpages debian/*.examples debian/*.binfmt debian/*.prerm
 +      -rmdir clang/include/clang/Debian/
 +      -rmdir lldb/docs/doc/
 +      chmod 644 llvm/cmake/config.guess.hack
+       rm -rf build-compiler-rt-wasm32 build-compiler-rt-wasm64
        if test -f lld/docs/ld.lld-$(LLVM_VERSION).1; then \
                mv lld/docs/ld.lld-$(LLVM_VERSION).1 lld/docs/ld.lld.1; \
        fi