diff -u mesa-17.2.4/debian/changelog mesa-17.2.4/debian/changelog
--- mesa-17.2.4/debian/changelog
+++ mesa-17.2.4/debian/changelog
@@ -1,3 +1,12 @@
+mesa (17.2.4-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 17.2.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 17 Oct 2017 23:01:04 +0000]
+  * Add more debug output to configure.ac
+  * Hardcode llvm soname, the code for auto-determining it seems to be misbehaving.
+  * Add build conflicts on libunwind-dev, having it installed currently breaks the build.
+ 
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Nov 2017 15:06:02 +0000
+
 mesa (17.2.4-1) unstable; urgency=medium
 
   * New upstream release.
diff -u mesa-17.2.4/debian/control mesa-17.2.4/debian/control
--- mesa-17.2.4/debian/control
+++ mesa-17.2.4/debian/control
@@ -49,6 +49,8 @@
  wayland-protocols (>= 1.9),
  zlib1g-dev,
  libglvnd-core-dev,
+Build-conflicts:
+ libunwind-dev
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git
 Homepage: https://mesa3d.org/
only in patch2:
unchanged:
--- mesa-17.2.4.orig/configure.ac
+++ mesa-17.2.4/configure.ac
@@ -2691,7 +2691,8 @@
     dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
     if test "x$enable_llvm_shared_libs" = xyes; then
         dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-        LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+        LLVM_SO_NAME=LLVM-5.0.0
+        AC_MSG_CHECKING(if $LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT exists)    
         AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
 
         if test "x$llvm_have_one_so" = xyes; then
@@ -2700,6 +2701,7 @@
         else
             dnl If LLVM was built with CMake, there will be one shared object per
             dnl component.
+            AC_MSG_CHECKING(if $LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT exists)
             AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"],
                     [AC_MSG_ERROR([Could not find llvm shared libraries:
 	Please make sure you have built llvm with the --enable-shared option