diff -Nru pcl-1.12.1+dfsg/debian/changelog pcl-1.12.1+dfsg/debian/changelog
--- pcl-1.12.1+dfsg/debian/changelog	2022-07-13 13:20:25.000000000 +0000
+++ pcl-1.12.1+dfsg/debian/changelog	2022-08-06 16:56:47.000000000 +0000
@@ -1,3 +1,10 @@
+pcl (1.12.1+dfsg-4+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.12.1+dfsg-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 03 Feb 2022 18:00:06 +0000]
+  * Build with clang 11 to avoid armv7 contamination.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 16:56:47 +0000
+
 pcl (1.12.1+dfsg-4) unstable; urgency=medium
 
   * Add upstream source
diff -Nru pcl-1.12.1+dfsg/debian/control pcl-1.12.1+dfsg/debian/control
--- pcl-1.12.1+dfsg/debian/control	2022-07-13 13:20:11.000000000 +0000
+++ pcl-1.12.1+dfsg/debian/control	2022-08-06 16:56:47.000000000 +0000
@@ -6,8 +6,8 @@
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
-	       clang [mipsel armel armhf],
 	       libstdc++-12-dev [mipsel armel armhf],
+	       clang-11 [mipsel armel armhf],
 	       python3-sphinx,
 	       libboost-system-dev,
 	       libboost-filesystem-dev,
diff -Nru pcl-1.12.1+dfsg/debian/rules pcl-1.12.1+dfsg/debian/rules
--- pcl-1.12.1+dfsg/debian/rules	2021-11-04 08:37:01.000000000 +0000
+++ pcl-1.12.1+dfsg/debian/rules	2022-08-06 16:56:47.000000000 +0000
@@ -8,8 +8,8 @@
 
 ifneq (,$(filter $(DEB_BUILD_ARCH),mipsel armhf armel))
   PARALLEL=--max-parallel=2
-  export CC=/usr/bin/clang
-  export CXX=/usr/bin/clang++
+  export CC=/usr/bin/clang-11
+  export CXX=/usr/bin/clang++-11
 else
   PARALLEL=
 endif