Merge remote-tracking branch 'origin/15' into 16

debian/changelog

@@ -96,6 +96,18 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 27 Jul 2022 21:36:27 +0200
 
+llvm-toolchain-15 (1:15.0.7-4) UNRELEASED; urgency=medium
+
+  * Fix debian/libclang1-15.symbols soname
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 15 Mar 2023 21:45:46 +0100
+
+llvm-toolchain-15 (1:15.0.7-3) unstable; urgency=medium
+
+  * Disable the flang autopkgtests on unsupported architectures
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 12 Mar 2023 11:19:54 +0100
+
 llvm-toolchain-15 (1:15.0.7-2) unstable; urgency=medium
 
   * Adjust some lintian overrides

debian/libclang1-X.Y.symbols.in

@@ -1,5 +1,5 @@
-libclang-@LLVM_VERSION@.so.13 libclang1-@LLVM_VERSION@ #MINVER#
- (optional)LLVM_13@LLVM_13 1:5.0~svn298832-1~
+libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
+ (optional)LLVM_13@LLVM_13 1:15.0.7-3
  clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~
  clang_BlockCommandComment_getCommandName@LLVM_13 1:5.0~svn298832-1~
  clang_BlockCommandComment_getNumArgs@LLVM_13 1:5.0~svn298832-1~

debian/qualify-clang.sh

@@ -1077,8 +1077,10 @@ g++ -nostdinc++ -I/usr/lib/llvm-$VERSION/bin/../include/c++/v1/ -L/usr/lib/llvm-
 ./o > /dev/null
 fi
 
-echo "Testing flang-$VERSION (Fortran) ..."
-echo 'program math
+
+if dpkg -l|grep -q flang-$VERSION; then
+    echo "Testing flang-$VERSION (Fortran) ..."
+    echo 'program math
   implicit none
   real :: x, y
   x = 3.14
@@ -1086,15 +1088,15 @@ echo 'program math
   print *, "x + y = ", x + y
 end program math
 ' > foo.f90
-flang-new-$VERSION foo.f90 -o foo && ./foo &> foo.log
-if ! grep -q "x + y =" foo.log 2>&1; then
-    echo "flang: Could not find the expected output"
-    exit -1
-fi
+    flang-new-$VERSION foo.f90 -o foo && ./foo &> foo.log
+    if ! grep -q "x + y =" foo.log 2>&1; then
+        echo "flang: Could not find the expected output"
+        exit -1
+    fi
 
 
-# testing with a shared libraries
-echo '
+    # testing with a shared libraries
+    echo '
 module hello_world
   contains
     subroutine say_hello()
@@ -1102,21 +1104,25 @@ module hello_world
     end subroutine say_hello
 end module hello_world
 ' > lib.f90
-flang-new-$VERSION -c lib.f90  -fpie
-flang-new-$VERSION -shared  -fpie -o libflib.so lib.o
+    flang-new-$VERSION -c lib.f90  -fpie
+    flang-new-$VERSION -shared  -fpie -o libflib.so lib.o
 
-echo '
+    echo '
 program main
    use hello_world
    call say_hello()
 end program main' > foo.f90
-flang-new-$VERSION foo.f90 -L. -lflib -o foo
-LD_LIBRARY_PATH=. ./foo &> foo.log
-if ! grep -q "Hello, World!" foo.log 2>&1; then
-    echo "flang: lib didn't work"
-    exit -1
+    flang-new-$VERSION foo.f90 -L. -lflib -o foo
+    LD_LIBRARY_PATH=. ./foo &> foo.log
+    if ! grep -q "Hello, World!" foo.log 2>&1; then
+        echo "flang: lib didn't work"
+        exit -1
+    fi
+    rm -f foo.log foo.f90 foo libflib.so
+else
+    echo "Skipping esting flang-$VERSION (Fortran) ..."
+    echo "doesn't exist on this arch"
 fi
-rm -f foo.log foo.f90 foo libflib.so
 
 # libclc
 echo "Testing libclc-$VERSION-dev ..."

debian/rules

@@ -467,25 +467,6 @@ ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes)
 	endif
 endif
 
-ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
-# enable the build using coverity
-# pbuilder contains BINDMOUNTS="/opt/cov-analysis/"
-# And we have some pbuilder hooks to configure and pack the result
-# Where the binaries are installed on the jenkins instance
-	PRE_PROCESS=PATH=$$PATH:/opt/cov-analysis/bin/ cov-build --dir cov-int
-# We don't want to check the temporary files produced by the configure
-	PRE_PROCESS_CONF=
-	COVERITY_ENABLE=1
-	CONFIGURE_EXTRA += --enable-assertions
-	STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
-# no need to run tests in this case
-	RUN_TEST=no
-	SCCACHE_ENABLE=no
-	SCCACHE_CMAKE=
-else
-	COVERITY_ENABLE=0
-endif
-
 # enables cmake build targets like stage2-[target_name]
 ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-sanitizer;llvm-config;test-suite