From 99d00fae8e1d469ff12ee0136967e3658813c9d8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Mar 2013 11:56:16 +0000 Subject: [PATCH] * Build using binutls-gold to improve the quality of the binaries. See: http://allievi.sssup.it/techblog/?p=791 * Detect the vendor (Debian or Ubuntu) and update the configuration * Port to powerpcspe. Thanks to Roland Stigge (Closes: #701587) See: 31-powerpcspe.diff * Fix the path detection of scan-build (Closes: #698352) See: 32-scan-build-path.diff --- debian/changelog | 14 +++++++++++++- debian/control | 2 +- debian/patches/31-powerpcspe.diff | 15 +++++++++++++++ debian/patches/series | 2 +- debian/rules | 6 ++++-- 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 debian/patches/31-powerpcspe.diff diff --git a/debian/changelog b/debian/changelog index ef59fe64..e1dbe2ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,22 @@ -llvm-toolchain (1:3.3~svn176476-1~exp1) experimental; urgency=low +llvm-toolchain (1:3.3~svn177222-1~exp1) experimental; urgency=low * Draft of a snapshot release (3.3) * Enable r600 experimental backend -- Sylvestre Ledru Tue, 26 Feb 2013 13:49:57 +0100 +llvm-toolchain-3.2 (1:3.2repack-1~exp3) experimental; urgency=low + + * Build using binutls-gold to improve the quality of the binaries. + See: http://allievi.sssup.it/techblog/?p=791 + * Detect the vendor (Debian or Ubuntu) and update the configuration + * Port to powerpcspe. Thanks to Roland Stigge (Closes: #701587) + See: 31-powerpcspe.diff + * Fix the path detection of scan-build (Closes: #698352) + See: 32-scan-build-path.diff + + -- Sylvestre Ledru Thu, 14 Mar 2013 17:47:12 +0100 + llvm-toolchain-3.2 (1:3.2repack-1~exp3) experimental; urgency=low * Remove package "clang". It is now provided by llvm-defaults. diff --git a/debian/control b/debian/control index e1ffc580..e32fd9ea 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl8.5, expect, sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9), 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) + libisl-dev (>= 0.11.1), binutils-gold Build-Conflicts: oprofile, ocaml Standards-Version: 3.9.3 Homepage: http://www.llvm.org/ diff --git a/debian/patches/31-powerpcspe.diff b/debian/patches/31-powerpcspe.diff new file mode 100644 index 00000000..b219f2a1 --- /dev/null +++ b/debian/patches/31-powerpcspe.diff @@ -0,0 +1,15 @@ +Index: llvm-3.2.src/clang/lib/Lex/Makefile +=================================================================== +--- llvm-3.2.src.orig/clang/lib/Lex/Makefile 2010-07-18 02:14:47.000000000 +0200 ++++ llvm-3.2.src/clang/lib/Lex/Makefile 2013-03-16 12:16:22.806998380 +0100 +@@ -17,8 +17,10 @@ + LIBRARYNAME := clangLex + + ifeq ($(ARCH),PowerPC) ++ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),powerpcspe) + CXX.Flags += -maltivec + endif ++endif + + include $(CLANG_LEVEL)/Makefile + diff --git a/debian/patches/series b/debian/patches/series index 4fd3e651..688c098a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,4 +20,4 @@ scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff polly-c++0x.diff - +31-powerpcspe.diff diff --git a/debian/rules b/debian/rules index 0c8b9e0b..380853a0 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif +VENDOR=$(lsb_release -is) + DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH_BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) @@ -112,13 +114,13 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LL --with-cloog --with-isl \ --with-bug-report-url=http://bugs.debian.org/ \ --enable-shared --enable-experimental-targets=R600 \ - CLANG_VENDOR=Debian || { cat config.log tools/polly/config.log; exit 1; } + CLANG_VENDOR=$(VENDOR) || { cat config.log tools/polly/config.log; exit 1; } # cd $(TARGET_BUILD) && cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON # mkdir build-compiler-rt && cd build-compiler-rt && cmake ../compiler-rt override_dh_auto_build: - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=Debian CXXFLAGS=-std=c++0x REQUIRES_RTTI=1 + $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS=-std=c++0x REQUIRES_RTTI=1 cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man # $(MAKE) $(NJOBS) -C build-compiler-rt VERBOSE=1 # Only available in clang 3.3