Use the static library libjsoncpp.a instead of the ship library in polly

debian/changelog

@@ -3,6 +3,7 @@ llvm-toolchain-3.3 (1:3.3-4) unstable; urgency=low
   * llvm-config-3.3 --libdir reports wrong directory (Closes: #717346)
   * Backport of upstream patch to fix the FTBFS under kfreebsd i386
   * binutils-gold no longer exists. Use -fuse-ld=gold instead.
+  * Use the static library libjsoncpp.a instead of the ship library in polly
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 01 Aug 2013 14:06:38 +0200
 

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect,
     lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev,
     libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev,
     libisl-dev (>= 0.11.1), binutils (>= 2.23.52.20130522),
-    lcov, procps, help2man
+    lcov, procps, help2man, libjsoncpp-dev
 Build-Conflicts: oprofile, ocaml
 Standards-Version: 3.9.4
 Homepage: http://www.llvm.org/

debian/patches/series

@@ -8,7 +8,6 @@
 profile_rt.diff
 30-kfreebsd.diff
 0003-Debian-version-info-and-bugreport.patch
-0010-shared-lib-paths.patch
 0021-shared-lib-debian.patch
 0023-link-libopagent.patch
 0044-soname.diff
@@ -25,8 +24,4 @@ clang-format-version.diff
 kfreebsd.diff
 add-ubuntu-saucy.patch
 lldb33-to-r183444.patch
-disabletestlldb.diff
-mipsel-ftbfs.diff
-kfreebsd_ptrace_kludge.diff
-kfreebsd_v2.diff
-patch-bug-16511.diff
+use-deb-json.diff

debian/patches/use-deb-json.diff

@@ -0,0 +1,23 @@
+Index: llvm-toolchain-3.3-3.3/polly/lib/Makefile
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/polly/lib/Makefile	2012-12-29 16:09:03.000000000 +0100
++++ llvm-toolchain-3.3-3.3/polly/lib/Makefile	2013-08-01 18:23:46.121975042 +0200
+@@ -27,9 +27,6 @@
+ DIRS += Support
+ USEDLIBS += pollysupport.a
+ 
+-DIRS += JSON
+-USEDLIBS += pollyjson.a
+-
+ # TODO: Export symbols for RTTI or EH?
+ 
+ #
+@@ -37,7 +34,7 @@
+ #
+ include $(LEVEL)/Makefile.common
+ 
+-LIBS += $(POLLY_LD) $(POLLY_LIB)
++LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
+ 
+ $(LibDir)/libpollyanalysis.a : $(LibDir)/.dir $(PROJ_OBJ_DIR)/Analysis/$(BuildMode)/.dir \
+                                $(PROJ_SRC_DIR)/Analysis/*