[PATCH 1/4] Merge from llvm-toolchain-3.2 branch up to 3.2repack-11.
Jon Severinsson
jon at severinsson.net
Sat Aug 31 07:30:53 UTC 2013
Most changes have been added separately to both branches, but a
few minor ones were missing, and the changelog was never merged.
---
debian/changelog | 127 +++++++++++++++++++++++++++++++++++++++++++++++-
debian/clang-3.3.links | 4 +-
debian/control | 2 +-
debian/rules | 4 +-
4 filer ändrade, 132 tillägg(+), 5 borttagningar(-)
diff --git a/debian/changelog b/debian/changelog
index 9df630e1..63990c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ llvm-toolchain-3.3 (1:3.3-9) UNRELEASED; urgency=low
* Only use -fuse-ld=gold on supported distribution. Simplify the
backports.
+ [ Jon Severinsson ]
+ * Merge from llvm-toolchain-3.2 branch up to 3.2repack-11.
+
-- Sylvestre Ledru <sylvestre at debian.org> Mon, 26 Aug 2013 14:48:42 +0200
llvm-toolchain-3.3 (1:3.3-8) unstable; urgency=low
@@ -129,7 +132,118 @@ llvm-toolchain-3.3 (1:3.3~+rc3-1~exp1) experimental; urgency=low
-- Sylvestre Ledru <sylvestre at debian.org> Fri, 19 Apr 2013 09:31:38 +0200
-llvm-toolchain-3.2 (1:3.2repack-1~exp3) experimental; urgency=low
+llvm-toolchain-3.2 (1:3.2repack-11) unstable; urgency=low
+
+ * dh_auto_clean removed, just like in the 3.3
+ * Use the static library libjsoncpp.a instead of shipping library in polly
+ Backport of the modification of 3.3
+
+ [ Adam Conrad ]
+ * Revive deltas from the previous Ubuntu versions of llvm and clang:
+ - debian/patches/35-ubuntu-releases.diff: Add UbuntuSaucy to table.
+ - debian/patches/JITEmitter.patch: Fix a segfault in the exception
+ table of the JIT code emitter (See Launchpad bug #1160587)
+
+ [ Luca Falavigna ]
+ * debian/patches/libprofile_rt_sparc.patch:
+ - Re-enable libprofile_rt on Sparc, fix FTBFS.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 23 Aug 2013 11:49:09 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-10) unstable; urgency=low
+
+ * Fix the wrong package declaration on libstdc++-4.8-dev (Closes: #713944)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 24 Jun 2013 23:00:47 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-9) unstable; urgency=low
+
+ * Switch to libstdc++ 4.8 instead of 4.7 for the headers (Closes: #712520)
+ * Depends against libobjc-4.8-dev and libgcc-4.8-dev
+ * Disable the usage of binutils-gold under armel. It currently fails with:
+ "attempt to map 2752512 bytes at offset 2066666 exceeds size of file;
+ the file may be corrupt"
+ * Add DEBUGMAKE=1 to get information about compiler-rt compilation
+ * Fix "libclang-common-dev: missing-depends-line"
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 22 Jun 2013 07:38:41 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-8) unstable; urgency=low
+
+ * Fix the build under ia64. Thanks to Luca Falavigna for the patch
+ (ia64-fix.diff)
+ * Disable lldb-3.2:
+ - the quality is not good enough
+ - We have lldb-3.3 now in the archive
+ - Too many backported patches would be necessary for lldb-3.2 to work
+ - It blocks some important transitions (mesa)
+ * Add the detection of Ubuntu saucy
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 03 Jun 2013 11:32:29 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-7) unstable; urgency=low
+
+ * For now, enable only lldb for amd64 and i386 (blocks too many things)
+ (Bis) (Closes: #707866)
+ * Add a symlink of libLLVM-3.2.so.1 to usr/lib/llvm-3.2/lib/libLLVM-3.2.so
+ to fix make the llvm-config-3.2 --libdir work (Closes: #708677)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 27 May 2013 13:20:30 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-6) unstable; urgency=low
+
+ * Create the compiler-rt directory to make the install of compiler-rt works
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 18 May 2013 18:08:52 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-5) unstable; urgency=low
+
+ * For now, enable only lldb for amd64 and i386 (blocks too many things)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 18 May 2013 10:24:04 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-4) unstable; urgency=low
+
+ * Add several patches which, hopefully, will fix the build under ARM, S390,
+ S390X, etc (lldb-apple_only.diff, lldb-user-remove.diff & lldb-hurd.diff)
+ * Include sys/wait.h also under kfreebsd (kfreebsd-thread.diff)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 15 May 2013 12:04:24 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-3) unstable; urgency=low
+
+ * Before the configure, show which version of CC is being used.
+ * Add support of kfreebsd and hurd in lldb (kfreebsd-hurd-lldb.diff)
+ * Force the usage of gcc 4.7 for all archs. Should fix some FTBFS
+ (Closes: #707866)
+ * Fix the symlink on clang++.1.gz llvm-clang.1.gz (Closes: #707832)
+
+ [ Jon Severinsson ]
+ * Re-enable the r600 backend and update it to the mesa-9.1.1 tag.
+ (Closes: #708009)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 14 May 2013 12:10:07 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-2) unstable; urgency=low
+
+ * Do not depend on libobjc-4.7-dev & libgcc-4.7-dev.
+ They are still only in experimental
+ * Disable the usage of binutils-gold under [powerpc powerpcspe ppc64 sparc
+ sparc64] to fix FTBFS
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 07 May 2013 13:15:20 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-1) unstable; urgency=low
+
+ * Upload to unstable
+ * Standards-Version update to 3.9.4
+ * clang pure virtual function call crash with binaries built with C++11's
+ std::thread. Upstream commit 178816 (Closes: #705838)
+ * Introduce a symbols file for libclang1 (Closes: #705672)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 21 Apr 2013 14:06:23 +0200
+
+llvm-toolchain-3.2 (1:3.2repack-1~exp4) experimental; urgency=low
* Build using binutls-gold to improve the quality of the binaries.
See: http://allievi.sssup.it/techblog/?p=791
@@ -138,6 +252,17 @@ llvm-toolchain-3.2 (1:3.2repack-1~exp3) experimental; urgency=low
See: 31-powerpcspe.diff
* Fix the path detection of scan-build (Closes: #698352)
See: 32-scan-build-path.diff
+ * debian/patches/r600-snapshot.diff: Move backports into individual patches.
+ * debian/patches/r600-snapshot.diff: Update to mesa-9.1 git tag.
+ (Closes: #703671, #697356)
+ * Fix a typo in the detection of the vendor
+
+ [ Peter Michael Green ]
+ * Use binutils-gold only on architectures where it is actually available
+ * 33-armhf-defaults.diff Fix defaults to use correct CPU and FPU for
+ debian armhf (Closes: #704111)
+ * 34-powerpc-no-altivec.diff disable altivec by default on powerpc because
+ debian powerpc does not require altivec (patch cherry picked from ubuntu)
-- Sylvestre Ledru <sylvestre at debian.org> Thu, 14 Mar 2013 17:47:12 +0100
diff --git a/debian/clang-3.3.links b/debian/clang-3.3.links
index 7ef4aa32..d42536f7 100644
--- a/debian/clang-3.3.links
+++ b/debian/clang-3.3.links
@@ -1,5 +1,5 @@
-usr/share/man/man1/clang.1.gz usr/share/man/man1/llvm-clang.1.gz
-usr/share/man/man1/clang.1.gz usr/share/man/man1/clang++.1.gz
+usr/share/man/man1/clang-3.3.1.gz usr/share/man/man1/llvm-clang.1.gz
+usr/share/man/man1/clang-3.3.1.gz usr/share/man/man1/clang++.1.gz
/usr/share/clang/scan-build/scan-build /usr/bin/scan-build
/usr/share/clang/scan-view/scan-view /usr/bin/scan-view
/usr/bin/clang /usr/bin/llvm-clang
diff --git a/debian/control b/debian/control
index f775325f..f52bb7a3 100644
--- a/debian/control
+++ b/debian/control
@@ -209,7 +209,7 @@ Description: clang library - Development package
Package: libclang-common-3.3-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libllvm3.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.3 (= ${binary:Version})
Replaces: llvm-3.3-dev (<< 1:3.2repack), libclang-3.3-dev
Breaks: llvm-3.3-dev (<< 1:3.2repack)
Description: clang library - Common development package
diff --git a/debian/rules b/debian/rules
index 7f00d742..8726371d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,6 +94,8 @@ debian/%: debian/%.in
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@
override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/pollycc
+ echo "Using gcc: "
+ $(CC) -v
mkdir -p $(TARGET_BUILD)
mkdir -p clang/include/clang/Debian
sed -e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|" \
@@ -150,7 +152,7 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LL
override_dh_auto_build:
- $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA) -std=c++0x" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1
+ $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA) -std=c++0x" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1
override_dh_prep: build_doc
dh_prep
--
1.7.10.4
More information about the Pkg-llvm-team
mailing list