Merge version 1:15.0.5-3+rpi1 and 1:15.0.6-4 to produce 1:15.0.6-4+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 13 Jan 2023 00:15:06 +0000 (00:15 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 13 Jan 2023 00:15:06 +0000 (00:15 +0000)
1  2 
debian/changelog
debian/control
debian/patches/series
debian/rules

index 901044699bcea6c917e0f0828e01b8e5e6649c9d,5101db81c5b849f8b87174d3eac2e48f8710bd80..58c86ee116645522657e6deae6212e0dea6982a6
@@@ -1,49 -1,41 +1,88 @@@
- llvm-toolchain-15 (1:15.0.5-3+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-15 (1:15.0.6-4+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 26 Nov 2022 18:48:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Jan 2023 00:15:05 +0000
++
+ llvm-toolchain-15 (1:15.0.6-4) unstable; urgency=medium
+   * link-grpc.diff: add the detection of other libs necessary for
+     grpc (Closes: #1025530)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 15:46:39 +0100
+ llvm-toolchain-15 (1:15.0.6-3) unstable; urgency=medium
+   * Build on spirv-15 for riscv64 too.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Nov 2022 16:15:42 +0100
+ llvm-toolchain-15 (1:15.0.6-2) unstable; urgency=medium
+   * Fix build on riscv64 by disabling WASM for now.
+   * Explicitly depend on spirv-14 for riscv64, to bootstrap spirv there.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Nov 2022 15:31:52 +0100
+ llvm-toolchain-15 (1:15.0.6-1) unstable; urgency=medium
+   * New upstream release
+  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 29 Nov 2022 15:25:58 +0100
+ llvm-toolchain-15 (1:15.0.5-5) unstable; urgency=medium
+   * Add riscv64 to spirv-15 supported list, now that the bootstrap is
+     finished.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 22 Nov 2022 12:41:35 +0100
+ llvm-toolchain-15 (1:15.0.5-4) unstable; urgency=medium
+   * Explicitly depend on spirv-14 for riscv64, to bootstrap spirv there.
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 22 Nov 2022 10:58:27 +0100
  
  llvm-toolchain-15 (1:15.0.5-3) unstable; urgency=medium
  
diff --cc debian/control
index a57f8544bc73d15eddd53f82efea50f0b018f9bc,62b7be9fd4e5ad657062dc7b8745e6525cbdf86c..02cb8566aa1356f3abbad209ba37f1b0542f0720
@@@ -18,12 -18,12 +18,12 @@@ 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,
-     llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
-     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
+     llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
      spirv-tools [ linux-any ] | hello [ !i386],
      libcurl4-dev,
      libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
index b87fd331f4f5743c677adfbd57f9321cc7223b1c,bee43cb80ffda7f3a719c76fff2e1dd827695fc1..352d029556aa1ef80ea6f12426f24eb99274d96d
@@@ -4,9 -4,10 +4,8 @@@ clang-analyzer-force-version.dif
  
  # Disabling features
  23-strlcpy_strlcat_warning_removed.diff
 -
  declare_clear_cache.diff
  unwind-chain-inclusion.diff
--
  # Path updates
  python-clangpath.diff
  fix-clang-path-and-build.diff
@@@ -15,11 -16,13 +14,10 @@@ 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/lldb-soname.diff
@@@ -63,13 -73,13 +61,11 @@@ libcxx/libcxx-silent-failure-arm64.dif
  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
  mips/mips-D101773-reloc.patch
  mips/syscall-mips64el-def.diff
--
  26-set-correct-float-abi.diff
  clang-baseline-fix-i386.patch
  disable-sse2-old-x86.diff
@@@ -97,18 -111,19 +93,15 @@@ hurd/hurd-pathmax.dif
  # kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
  # kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
  # kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
 -
  930008-arm.diff
  bootstrap-fix-include-next.diff
--
  # bug 939472
  #try-to-unbreak-thinlto.diff
  #D67877-cmake-clang-example.patch
--
  python3-shebang.patch
  lldb/print-lldb-path.patch
  lower-python-dep.diff
  scan-build-py-fix-default-bin.diff
--
  omp-riscv64.patch
  lldb/test-disable-lldb-i386.diff
  unbreak-atomic-mips.diff
@@@ -117,18 -132,18 +110,14 @@@ openmp-fix-runtimes-build.dif
  libclc-fix-prepare_builtins-rpath.diff
  llvm-runtimes-builtins-build-check.diff
  issue-54242.diff
--
  # 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
  unwind-force-pthread-dl.diff
  force-sse2-compiler-rt.diff
@@@ -138,9 -153,8 +127,8 @@@ bolt-disable-emit-relocs.patc
  D124841-fix-powerpc-miscompile.patch
  mips/mips-assert-size.diff
  protobuf_3.21.patch
--
  # upstream cherry-pick for mesa build
  add-arm-vcmpz-test.patch
  fix-mesa-build.patch
+ link-grpc.diff
 +raspbian-triplet.patch
diff --cc debian/rules
Simple merge