--- llvm-2.7~svn20100409.orig/debian/rules +++ llvm-2.7~svn20100409/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +# build not yet prepared to take variables from the environment +define unsetenv + unexport $(1) + $(1) = +endef +$(foreach v, CPPFLAGS CFLAGS CXXFLAGS FFLAGS LDFLAGS, $(if $(filter environment,$(origin $(v))),$(eval $(call unsetenv, $(v))))) + +include debian/rules.d/vars.mk + +ifneq (,$(findstring llvm,$(PKGSOURCE))) + ifneq (,$(findstring llvm-gcc-,$(PKGSOURCE))) + gcc_version := $(shell echo $(PKGSOURCE) | cut -d'-' -f3) + endif + include debian/packages.d/$(PKGSOURCE).mk +else + tools := clang #vmkit + include debian/packages.d/tools.mk +endif + +builddir := build-$(PKGSOURCE) +patchdirs += $(D)/debian/patches +ifeq (,$(strip $(tarball))) + srcdir := . +else + ifeq (,$(strip $(srcdir))) + $(error undefined srcdir) + endif +endif + +include debian/rules.d/control.mk +include debian/rules.d/unpack.mk +include debian/rules.d/build.mk +include debian/rules.d/binary.mk + +clean: + $(RM) -r $(stampdir) $(builddir) +ifneq (,$(strip $(tarball))) + $(RM) -r $(srcdir) +endif + +.PHONY: clean --- llvm-2.7~svn20100409.orig/debian/0024-ubuntu-arm-llc-lli-defaults.patch +++ llvm-2.7~svn20100409/debian/0024-ubuntu-arm-llc-lli-defaults.patch @@ -0,0 +1,126 @@ +--- ./tools/llc/llc.cpp.orig 2010-03-09 12:02:36.104835777 +0100 ++++ ./tools/llc/llc.cpp 2010-03-09 12:23:44.391086063 +0100 +@@ -41,6 +41,39 @@ + #include "llvm/Target/TargetSelect.h" + #include "llvm/Transforms/Scalar.h" + #include ++ ++/* We need a better way of testing for this, but for now, this is all ++ we can do. */ ++// This selects the minimum architecture level required. ++#define __ARM_ARCH__ 3 ++ ++#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 4 ++#endif ++ ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \ ++ || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \ ++ || defined(__ARM_ARCH_5TEJ__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 5 ++#endif ++ ++#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ ++ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ ++ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ ++ || defined(__ARM_ARCH_6M__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 6 ++#endif ++ ++#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ ++ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ ++ || defined(__ARM_ARCH_7EM__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 7 ++#endif ++ + using namespace llvm; + + // General options for llc. Other pass-specific options are specified +@@ -77,11 +110,20 @@ + cl::value_desc("cpu-name"), + cl::init("")); + ++#if __ARM_ARCH__ >= 6 ++static cl::list ++MAttrs("mattr", ++ cl::CommaSeparated, ++ cl::desc("Target specific attributes (-mattr=help for details)"), ++ cl::value_desc("a1,+a2,-a3,..."), ++ cl::init("+v6,+vfp2")); ++#else + static cl::list + MAttrs("mattr", + cl::CommaSeparated, + cl::desc("Target specific attributes (-mattr=help for details)"), + cl::value_desc("a1,+a2,-a3,...")); ++#endif + + cl::opt + FileType("filetype", cl::init(TargetMachine::CGFT_AssemblyFile), +--- ./tools/lli/lli.cpp.orig 2010-03-09 12:02:36.104835777 +0100 ++++ ./tools/lli/lli.cpp 2010-03-09 12:22:43.801085969 +0100 +@@ -32,6 +32,39 @@ + #include "llvm/System/Signals.h" + #include "llvm/Target/TargetSelect.h" + #include ++ ++/* We need a better way of testing for this, but for now, this is all ++ we can do. */ ++// This selects the minimum architecture level required. ++#define __ARM_ARCH__ 3 ++ ++#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 4 ++#endif ++ ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \ ++ || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \ ++ || defined(__ARM_ARCH_5TEJ__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 5 ++#endif ++ ++#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ ++ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ ++ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ ++ || defined(__ARM_ARCH_6M__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 6 ++#endif ++ ++#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ ++ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ ++ || defined(__ARM_ARCH_7EM__) ++# undef __ARM_ARCH__ ++# define __ARM_ARCH__ 7 ++#endif ++ + using namespace llvm; + + namespace { +@@ -67,11 +100,20 @@ + cl::value_desc("cpu-name"), + cl::init("")); + ++#if __ARM_ARCH__ >= 6 ++ cl::list ++ MAttrs("mattr", ++ cl::CommaSeparated, ++ cl::desc("Target specific attributes (-mattr=help for details)"), ++ cl::value_desc("a1,+a2,-a3,..."), ++ cl::init("+v6,+vfp2")); ++#else + cl::list + MAttrs("mattr", + cl::CommaSeparated, + cl::desc("Target specific attributes (-mattr=help for details)"), + cl::value_desc("a1,+a2,-a3,...")); ++#endif + + cl::opt + EntryFunc("entry-function", --- llvm-2.7~svn20100409.orig/debian/copyright +++ llvm-2.7~svn20100409/debian/copyright @@ -0,0 +1,89 @@ +This package was debianized by Arthur Loiret on +Sun, 10 Nov 2007 12:32:05 +0200. + +It was downloaded from http://llvm.org/releases/download.html + + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + 14 rue de Plaisance, 75014 Paris, France + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. + +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2003-2007 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory +------- --------- +System Library llvm/lib/System +Compiler Driver llvm/tools/llvmc +Autoconf llvm/autoconf + llvm/projects/ModuleMaker/autoconf + llvm/projects/sample/autoconf + --- llvm-2.7~svn20100409.orig/debian/compat +++ llvm-2.7~svn20100409/debian/compat @@ -0,0 +1 @@ +6 --- llvm-2.7~svn20100409.orig/debian/llvm.binfmt +++ llvm-2.7~svn20100409/debian/llvm.binfmt @@ -0,0 +1,3 @@ +package llvm +interpreter /usr/bin/lli +magic llvc --- llvm-2.7~svn20100409.orig/debian/logwatch.sh +++ llvm-2.7~svn20100409/debian/logwatch.sh @@ -0,0 +1,104 @@ +#! /bin/sh + +# script to trick the build daemons and output something, if there is +# still test/build activity + +# $1: primary file to watch. if there is activity on this file, we do nothing +# $2+: files to watch to look for activity despite no output in $1 +# if the files are modified or are newly created, then the message +# is printed on stdout. +# if nothing is modified, don't output anything (so the buildd timeout +# hits). + +pidfile=logwatch.pid +timeout=3600 +message='\nlogwatch still running\n' + +usage() +{ + echo >&2 "usage: `basename $0` [-p ] [-t ] [-m ]" + echo >&2 " [ ...]" + exit 1 +} + +while [ $# -gt 0 ]; do + case $1 in + -p) + pidfile=$2 + shift + shift + ;; + -t) + timeout=$2 + shift + shift + ;; + -m) + message="$2" + shift + shift + ;; + -*) + usage + ;; + *) + break + esac +done + +[ $# -gt 0 ] || usage + +logfile="$1" +shift +otherlogs="$@" + +cleanup() +{ + rm -f $pidfile + exit 0 +} + +#trap cleanup 0 1 3 15 + +echo $$ > $pidfile + +update() +{ + _logvar=$1 + _othervar=$2 + + # logfile may not exist yet + if [ -r $logfile ]; then + _logtail="`tail -10 $logfile | md5sum` $f" + else + _logtail="does not exist: $logfile" + fi + eval $_logvar="'$_logtail'" + + _othertails='' + for f in $otherlogs; do + if [ -r $f ]; then + _othertails="$_othertails `tail -10 $f | md5sum` $f" + else + _othertails="$_othertails does not exist: $f" + fi + done + eval $_othervar="'$_othertails'" +} + +update logtail othertails +while true; do + sleep $timeout + update newlogtail newothertails + if [ "$logtail" != "$newlogtail" ]; then + # there is still action in the primary logfile. do nothing. + logtail="$newlogtail" + elif [ "$othertails" != "$newothertails" ]; then + # there is still action in the other log files, so print the message + /bin/echo -e $message + othertails="$newothertails" + else + # nothing changed in the other log files. maybe a timeout ... + : + fi +done --- llvm-2.7~svn20100409.orig/debian/changelog +++ llvm-2.7~svn20100409/debian/changelog @@ -0,0 +1,605 @@ +llvm (2.7~svn20100409-0ubuntu1) lucid; urgency=low + + * Snapshot, taken from the 2.7 release branch (20100409). + * Link the shared library with -Wl,-Bsymbolic-functions. + * llvm-dev: Depend on oprofile. LP: #557033. + + -- Matthias Klose Fri, 09 Apr 2010 14:25:24 +0200 + +llvm (2.7~svn20100330-0ubuntu2) lucid; urgency=low + + * Set llvm-config's include directory to /usr/include. LP: #431313. + * Don't link libllvm2.7 with -lbfd. libopagent1 is properly built. + Avoiding a direct versioned dependency on binutils. + * 0003-Debian-version-info-and-bugreport.patch: Update for the branch. + * Don't continue the build when patches fail to apply. + + -- Matthias Klose Tue, 30 Mar 2010 14:22:23 +0200 + +llvm (2.7~svn20100330-0ubuntu1) lucid; urgency=low + + * Snapshot, taken from the 2.7 release branch (20100330). + + -- Matthias Klose Tue, 30 Mar 2010 02:24:34 +0200 + +llvm (2.7~svn20100317-0ubuntu1) lucid; urgency=low + + * llvm 2.7 prerelease 1. + * libllvm2.7: Use the final soname. + + -- Matthias Klose Thu, 18 Mar 2010 09:21:29 +0100 + +llvm (2.7~svn20100308-0ubuntu3) lucid; urgency=low + + * Fix build failure on ARM. + + -- Matthias Klose Wed, 10 Mar 2010 14:24:37 +0100 + +llvm (2.7~svn20100308-0ubuntu2) lucid; urgency=low + + * Fix installation of TOOLALIAS targets. + * Don't link with /usr/lib/oprofile runpath. + * Configure with --disable-assertions. + * On ARM, default to v6,vfp2 for code generation. + * Run the testsuite on armel. + + -- Matthias Klose Tue, 09 Mar 2010 13:42:56 +0100 + +llvm (2.7~svn20100308-0ubuntu1) lucid; urgency=low + + * Snapshot, taken from the 2.7 release branch (20100308). + + -- Matthias Klose Mon, 08 Mar 2010 16:22:04 +0100 + +llvm (2.7~svn20100227-0ubuntu1~ppa1) lucid; urgency=low + + * Snapshot, taken from the trunk (20100227). + * Build a shared libLLVM library in libllvm2.7. + * Build using rtti. + + -- Matthias Klose Sat, 27 Feb 2010 12:35:33 +0100 + +llvm (2.7~svn20100221-0ubuntu2) lucid; urgency=low + + * debian/rules.d/vars.mk: Set UVERSION for snapshot builds. + * Update armel thumb patch for recent snapshot. + + -- Matthias Klose Sun, 21 Feb 2010 19:16:04 +0100 + +llvm (2.7~svn20100221-0ubuntu1) lucid; urgency=low + + * Snapshot, taken from the trunk (20100221). + + -- Matthias Klose Sun, 21 Feb 2010 17:12:48 +0100 + +llvm (2.7~svn20100204-0ubuntu1) lucid; urgency=low + + * Snapshot, taken from the trunk (20100204). + * Configure with --enable-optimized. + * Unset flags set by dpkg-buildpackage. + * Build with -marm on armel. + * Apply proposed fix for issue 6065. + * Work around GCC ICE on armel thumb. + + -- Matthias Klose Thu, 04 Feb 2010 18:11:37 +0100 + +llvm (2.6-6) unstable; urgency=low + + * Install vim and emacs syntax files. Closes: #489980. + - debian/debhelper.in/llvm-dev.{dirs,install}: Install .vim and .el files. + - debian/packages.d/llvm.mk (llvm-dev_extra_binary): Install README files. + * Build system fixes: + - debian/rules.d/unpack.mk: + + Add missing "touch $@" in $(patch-stamp) target. Closes: #571577. + + Robustify more. + - debian/rules.d/binary.mk: Make binary stamps depend on $(install-stamp). + - debian/rules.d/vars.mk (dev_version): New variable, required llvm-dev + version for llvm-gcc and tools. Bump to 2.6-6. + * Patches work: + - debian/patches/0008-path-eraseFromDisk.patch: Refresh. + - debian/patches/0011-Hurd-fixes.patch: Add, dirtily fix build on Hurd. + * debian/debhelper.in/clang.install: Ship scan-build and ccc-analyzer. + * debian/control.in/source: Bump Standards-Version to 3.8.4. + + -- Arthur Loiret Fri, 26 Feb 2010 10:20:31 +0000 + +llvm (2.6-5) unstable; urgency=low + + * debian/control.in/source: Build-Depends on libffi-dev and lsb-release. + * debian/rules.d/vars.mk: + - Configure with --enable-optimized and --enable-libffi. + - New variable $(OS), for portability with Ubuntu. + * debian/rules.d/unpack.mk: Robustify patch system. + * debian/packages.d/llvm-gcc-4.2.mk: Run testsuite on i386 and amd64. + * Backport changes from Ubuntu: + - debian/packages.d/*.mk: Use $(OS) instead of Debian in version strings. + - 0008-path-eraseFromDisk.patch: Add, use fork/exec instead of system to + avoid quoting problems. + - 0009-Fix-doclinks.patch: Add, fix broken links in index.html. + Closes: #469529. + - 0010-ARM-BX_to_BLX.patch: Add, fix to allow shark work on ARM + (Xerxes Ranby). + + -- Arthur Loiret Wed, 24 Feb 2010 12:00:08 +0000 + +llvm (2.6-4) unstable; urgency=low + + * Stop building on unsupported ia64, mips{,el} processors. + * Merge clang 2.6-1 and llvm-gcc-4.2 2.6-3. + + -- Arthur Loiret Sun, 06 Dec 2009 18:32:04 +0000 + +llvm (2.6-3) unstable; urgency=low + + * Build a llvm-source package. + * Merge from llvm-gcc-4.2 2.6-2: + - debian/packages.d/llvm-gcc-4.2.mk: Define llvm-gcc-4.2_extra_binary, + Adds symlinks for binaries. + + -- Arthur Loiret Mon, 16 Nov 2009 21:34:12 +0000 + +llvm (2.6-2) unstable; urgency=low + + * 0007-Triple.h-Avoid-identifier-conflicts-on-mips-and-spar.patch: Add, + maybe fix the build on sparc and mips{,el}. + * Various fixes in the build system. + + -- Arthur Loiret Mon, 16 Nov 2009 19:32:58 +0000 + +llvm (2.6-1) unstable; urgency=low + + * New upstream release. + - 0007-Move-IA64-asmprinter-to-separate-library.patch, + 0008-Move-MIPS-asmprinter-to-separate-library.patch: Remove. + * 0006-Build-LLVM-with-O2.patch: Remove, pass OPTIMIZE_OPTION to make + instead. + * Improve build system, add build infrastructure for tools. + * Remove RPATHS from all binaries and libraries. + + -- Arthur Loiret Sun, 15 Nov 2009 20:24:40 +0000 + +llvm (2.6-0ubuntu1) karmic; urgency=low + + * llvm-2.6 release. LP: #460345. + - PR 4825, mark a test as passing on all x86. + - Merge 79729 from mainline, change + SmallString::operator{=,+=} to take a StringRef. + - Fix PR5112, a miscompilation on gcc-4.0.3. + - Update release notes. + + -- Matthias Klose Sat, 24 Oct 2009 20:44:31 +0200 + +llvm (2.6~svn20091006-0ubuntu1) karmic; urgency=low + + * New upstream snapshot, taken from the 2.6 release branch (20091006). + - Fixes PR5038, PR4910, PR5001, PR5002. + * 0009-ARM-BX_to_BLX.patch: Fix to allow shark work on ARM (Xerxes Ranby). + + -- Matthias Klose Wed, 07 Oct 2009 13:19:58 +0200 + +llvm (2.6~svn20090918-0ubuntu1) karmic; urgency=low + + * New upstream snapshot, taken from the 2.6 release branch (20090918). + * Fix some links to local files in the html docs. Closes: #469529. + + -- Matthias Klose Fri, 18 Sep 2009 10:19:52 +0200 + +llvm (2.6~svn20090909-0ubuntu1) karmic; urgency=low + + * New upstream snapshot, taken from the 2.6 release branch (20090909). + * Build-depend on lsb-release, include the distribution name in the + version info. + + -- Matthias Klose Wed, 09 Sep 2009 17:40:14 +0200 + +llvm (2.5+svn20090820-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090820). Next round of API changes. + + -- Matthias Klose Thu, 20 Aug 2009 13:09:21 +0200 + +llvm (2.5+svn20090804-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090804). Some API's reverted back + to those of the 2.5 release. + + -- Matthias Klose Tue, 04 Aug 2009 19:30:32 +0200 + +llvm (2.5+svn20090715-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090715). Another API change, API freeze + is planned for Aug 21. + + -- Matthias Klose Wed, 15 Jul 2009 09:25:51 -0400 + +llvm (2.5+svn20090714-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090714). + * lib/System/Unix/Path.inc Path::eraseFromDisk: Use fork/exec instead of + system to avoid quoting problems. + + -- Matthias Klose Tue, 14 Jul 2009 16:38:06 +0200 + +llvm (2.5+svn20090710-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090710). + * Remove patches for PR4427 and PR4429, applied upstream. + + -- Matthias Klose Fri, 10 Jul 2009 11:36:56 +0200 + +llvm (2.5+svn20090623-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090623). + * Apply proposed patches for PR4427 and PR4429. + + -- Matthias Klose Tue, 23 Jun 2009 12:26:28 +0200 + +llvm (2.5+svn20090620-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090620). + + -- Matthias Klose Sat, 20 Jun 2009 19:21:18 +0200 + +llvm (2.5+svn20090504-0ubuntu1) karmic; urgency=low + + * New upstream snapshot (svn 20090504). + * Update debian patches for the snapshot. + + -- Matthias Klose Mon, 04 May 2009 14:59:27 +0200 + +llvm (2.5-3) unstable; urgency=low + + * Backport from mainline: + - 0007-Move-IA64-asmprinter-to-separate-library.patch. + - 0008-Move-MIPS-asmprinter-to-separate-library.patch. + * This hopefuly fixes the FTBFS on mips. Closes: #518592. + * Fix $LLVM_SRC_ROOT and $LLVM_OBJ_ROOT for real. + * Also fix dependency_libs and libdir. + * Support AVR32: + - Build-Depends on autotools-dev (>= 20060702.1). + - Update config.sub and config.guess. Closes: #535729. + * Bump Standards-Version to 3.8.3. + + -- Arthur Loiret Fri, 06 Nov 2009 15:30:40 +0000 + +llvm (2.5-2) unstable; urgency=low + + * Configure all components with PIC enabled, this includes llvm-gcc-4.2. + * Set $LLVM_SRC_ROOT and $LLVM_OBJ_ROOT to $(PF)/build in binary target. + * Build-Conclicts on ocaml to prevent ocaml bindings to be built. This + should be kept until we build an llvm-ocaml binding package. + * Disable parallel build by default. + + -- Arthur Loiret Fri, 13 Mar 2009 12:31:49 +0000 + +llvm (2.5-1) unstable; urgency=low + + * New upstream release. Closes: #518406. + * Update patches: + - 0007-Separate-alpha-asmprinter.-This-should-unbreak-nativ.patch, + 0008-Separate-sparc-asmprinter.-This-should-unbreak-the-n.patch: Remove. + - Refresh all others. + * Configure with --with-pic --enable-pic. Closes: #518476. + * Remove dangling symlinks. Closes: #509669. + - Now autogenerate debian/llvm.links in debian/rules.d/binary.mk. + * Update build infrastructure for llvm-snapshot and llvm-gcc. + + -- Arthur Loiret Fri, 06 Mar 2009 19:19:06 +0000 + +llvm (2.4-1~exp1) experimental; urgency=low + + * Backport from mainline: + - 0007-Separate-alpha-asmprinter.-This-should-unbreak-nativ.patch. + - 0008-Separate-sparc-asmprinter.-This-should-unbreak-the-n.patch. + * debian/debhelper.in/llvm-dev.install: Also install configure, + config.status and autoconf/ in /usr/lib/llvm/build, will be required + to build clang. + * debian/debhelper.in/llvm.postinst, debian/debhelper.in/llvm.prerm: + Remove full path for update-binfmts. + + -- Arthur Loiret Mon, 24 Nov 2008 20:39:24 +0000 + +llvm (2.4-1~exp0) experimental; urgency=low + + * New upstream release. Closes: #505394 + - Update patches. + * debian/rules: + - Support DEB_BUILD_OPTIONS=parallel=n. + - Depect cpu number and run parallel build by default. + * debian/rules.d/binary.mk: Remove extra license file. + * debian/rules.d/unpack.mk: Really unpatch sources on clean. + * debian/control: Bump Standards-Version to 3.8.0. + * Merge changes between versions 2.2-9 and 2.2-12. + + -- Arthur Loiret Sat, 22 Nov 2008 10:43:59 +0000 + +llvm (2.3-1~exp0) experimental; urgency=low + + * New upstream release. Closes: #489255 + - Update patches. + * debian/debhelper.in/llvm.install: No more config files. + + -- Arthur Loiret Tue, 08 Jul 2008 18:42:51 +0000 + +llvm (2.2-12) unstable; urgency=low + + * 4 revisions to fix debian/control, how lame am I… + Properly update debian/control.in/llvm-examples. + + -- Pierre Habouzit Mon, 13 Oct 2008 10:02:55 +0200 + +llvm (2.2-11) unstable; urgency=low + + * +~ sorts before +bX which defeats its purpose. Use +c~ to be sorted + _after_ binNMUs. + + -- Pierre Habouzit Sun, 12 Oct 2008 18:49:45 +0200 + +llvm (2.2-10) unstable; urgency=high + + * New upload to fix previous borked one. + + -- Pierre Habouzit Sun, 05 Oct 2008 16:19:21 +0200 + +llvm (2.2-9) unstable; urgency=high + + * Make llvm bin-NMU friendly (Closes: #499469). + + -- Pierre Habouzit Sun, 05 Oct 2008 09:37:52 +0200 + +llvm (2.2-8) unstable; urgency=high + + * Run testsuite on kfreebsd-i386 and kfreebsd-amd64 as well. + * Don't append LLVM_DEBIAN_INFO to llvm-config. Closes: #481967 + + -- Arthur Loiret Sat, 28 Jun 2008 16:11:48 +0000 + +llvm (2.2-7) unstable; urgency=high + + * Fix i386-only FTBFS due to missing #include (Closes: 474863). + + -- Pierre Habouzit Sun, 20 Apr 2008 21:40:59 +0200 + +llvm (2.2-6) unstable; urgency=low + + [ Arthur Loiret ] + * Don't build llvm-stub: Closes: #468339 + - patches/0007-Disable-llvm-stub.patch: Add. + - debhelper.in/llvm.links: Update. + * Run the testsuite on amd64 i386 ia64 powerpc s390 sparc only. + + [ Pierre Habouzit ] + * Update patches/0006-Build-with-g-4.3.patch with missing hunk. + (Closes: 417382). + + -- Pierre Habouzit Sun, 06 Apr 2008 00:33:49 +0200 + +llvm (2.2-5) unstable; urgency=low + + * brown paper bag bug, fix llvm-examples.links reordering arguments + (Closes: 470409). + + -- Pierre Habouzit Tue, 11 Mar 2008 10:03:09 +0100 + +llvm (2.2-4) unstable; urgency=low + + [ Pierre Habouzit ] + * debian/control: + + Missing Provides: llvm-libs in llvm-dev Package. + * patches/0005-Build-LLVM-with-O2.patch: build llvm with -O2 to ease + buildd's life. + * Install Makefile.{common,config,rules} in /usr/lib/llvm/build. + * Add links to the Makefiles from llvm-examples (Closes: 469531). + * Rework dependency chains: + + llvm-example depends llvm-dev. + + llvm-dev depends llvm. + + llvm depends nothing, but recommends llvm-dev. + * patches/0006-Build-with-g-4.3.patch: add patch to build with g++-4.3 + (Closes: 417382). + + [ Arthur Loiret ] + * Use logwatch script from gcc to prevent testsuite timeouts. + + -- Pierre Habouzit Mon, 10 Mar 2008 13:22:45 +0100 + +llvm (2.2-3) unstable; urgency=low + + [ Arthur Loiret ] + * 0004-Fix-TOOLDIR-path-for-gccas-and-gccld.patch: Add. Closes: #468341 + * debian/debhelper.in/llvm-doc.install: don't install html.tar.gz, already + in untared html dir. Closes: #468338 + * Rename llvm-libs to llvm-dev and include headers in it. Closes: #468344 + + [ Pierre Habouzit ] + * Fix postinst/prerm binfmts registration for chroots. + + -- Pierre Habouzit Mon, 03 Mar 2008 01:21:00 +0100 + +llvm (2.2-2) unstable; urgency=low + + [ Arthur Loiret ] + * Don't Build-Depends on graphviz, not needed. + * Run testsuite by default. + * 0001-Update-configure-script-for-kfreebsd-gnu-and-hurd.patch: New, + fix FTBFS on kfreebsd-gnu and hurd. + * 0002-Fix-llvm-config-script.patch: New, fix lib and include paths. + * 0003-Debian-version-info-and-bugreport.patch: New, mention Debian revision + in --version, update bugreport contact (set to pkg-llvm mailling list). + + -- Pierre Habouzit Fri, 22 Feb 2008 14:04:39 +0100 + +llvm (2.2-1) unstable; urgency=low + + [ Pierre Habouzit ] + * New upstream release. + * debian/debhelper.in/llvm-examples.examples: add missing file so that + llvm-examples isn't empty. + * debian/debhelper.in/llvm.{preinst,postinst}: use binfmt-support to + register llvm.binfmts properly. + + [ Arthur Loiret ] + * debian/debhelper.in/llvm.install: Remove libs, + * debian/rules.d/build.mk: Remove extra-license-file. + + -- Pierre Habouzit Tue, 12 Feb 2008 11:11:34 +0100 + +llvm (2.1.99-20080209-2) experimental; urgency=low + + * Reinstate lost crhpath to remove unsafe rpath. + + -- Pierre Habouzit Sun, 10 Feb 2008 02:35:19 +0100 + +llvm (2.1.99-20080209-1) experimental; urgency=low + + [ Arthur Loiret ] + * New Maintainers. Closes: #451106, #451384, #449355 + * New upstream release, new build system (again). + * debian/control.in/llvm-gcc: + + Update llvm-gcc description. Closes: #441382 + * debian/copyright: Update. + + [ Pierre Habouzit ] + * debian/control.in/source, debian/control: + + add Vcs-* headers. + * Bump compat to 6. + + -- Arthur Loiret Thu, 07 Feb 2008 15:22:43 +0100 + +llvm (2.1-0~exp1) experimental; urgency=low + + [ Arthur Loiret ] + * Initial llvm2 upload, the packaging is not over yet and we need to test a + few things before uploading it to unstable. Closes will be added then. + * Remove dpatch from build-depends, not used anymore. + * New build system. + + [ Pierre Habouzit ] + * debian/control: + + Remove version for doxygen build-depends as it's not even in oldstable. + + Bump Standards-Version to 3.7.3. + + Add Homepage field. + + -- Pierre Habouzit Mon, 07 Jan 2008 15:09:16 +0100 + +llvm (1.8b-1) unstable; urgency=low + + * Closes: bug#356095: missing llvmc from package (over-zealous cleanup + was removing it) + * Replace entire C front-end (CFE)with latest from CVS (as recommended by + upstream); this will get re-synced with the 1.9 release. + * Re-enable amd64 build. + * Closes: bug#380151 -- FTBFS on ia64 and amd64; new CFE fixes ia64, + but amd64 is hacked back in and not officially supported upstream. + * Closes: bug#389300 -- ia64/unstable FTBFS: compile errors (duplicate) + * Closes: bug#394883 -- ia64/unstable FTBFS: compile errors (duplicate) + + -- Al Stone Mon, 23 Oct 2006 12:53:33 -0600 + +llvm (1.8a-1) unstable; urgency=low + + * Upgrade to latest upstream. + * Closes: bug#385767 -- New upstream release + * Closes: bug#382897 -- Please stop Build-Depending on automake (patch + was wrong, dependency is actually on 1.9, not 1.4) + * Makefile used 'tar xvzf' which was far too noisy; using 'tar xzf' now. + * Closes: bug#380150 -- claims front-end is based on GCC 3.4 but it's 4.0.1 + now; fixed the control file to reflect the proper version. + * Closes: bug#390289 -- problem with update-binfmts when purging packagei + llvm; update-binfmts was being invoked with the wrong arguments + + -- Al Stone Sat, 21 Oct 2006 12:27:09 -0600 + +llvm (1.7-3) unstable; urgency=low + + * Closes: bug#376138 -- llvm: postinst failure in update-binfmts + * Closes: bug#373655 -- amd64 FTBS; this is _not_ a fully supported + architecture; the C backend is the only backend available, iff one + uses an older gcc frontend. Waiting for upstream or helping them + are the best options. + + -- Al Stone Tue, 11 Jul 2006 08:33:48 -0600 + +llvm (1.7-2) unstable; urgency=low + + * Closes: bug#374615: llvm-doc: do not ship doxygen.tar.gz and html.tar.gz + * Closes: bug#373655: amd64/unstable FTBFS -- Unsuported LLVM Target + x86_64-unknown-linux-gnu; this is not yet a supported architecture + for this package and should not have been included. + + -- Al Stone Mon, 26 Jun 2006 08:43:40 -0600 + +llvm (1.7-1) unstable; urgency=low + + * New upstream source (1.7) + * Add alpha architecture, be nicer to sparc + * Closes: bug#370161 -- FTBS due to doxygen bug in older versions (patch + from NMU was not used in order to keep dependencies straightforward) -- + bug #345952 closed from doxygen NMU. + * Closes: bug#357015 -- bashism in /etc/init.d/llvm, by removing the use + is the /etc/init.d script and instead using update-binfmts(8). + * Closes: bug#357016 -- please consider replacing /etc/init.d/llvm with + update-binfmts(8) + + -- Al Stone Tue, 13 Jun 2006 18:11:22 -0600 + +llvm (1.6-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Build-depend on fixed doxygen (>= 1.4.6-2.1); fixes FTBFS. + (Closes: #357722) + + -- Steinar H. Gunderson Sat, 3 Jun 2006 13:52:35 +0200 + +llvm (1.6-1) unstable; urgency=low + + * Closes: bug#339768 -- new upstream version + * Closes: bug#332517 -- FTBS on s390 (it's not a supported architecture) + + -- Al Stone Sun, 1 Jan 2006 15:23:30 -0700 + +llvm (1.5-1) unstable; urgency=low + + * Updated to latest upstream (1.5) + * Removed restriction requiring gcc 3.3 on i386 (no longer needed). + * Updated to latest standards version + * Removed dependency on pax (no longer needed) + * NB: this version was not released into the wild due to my inability to + get it done in a reasonable amount of time + + -- Al Stone Sat, 10 Sep 2005 17:30:42 -0600 + +llvm (1.5-0b) unstable; urgency=low + + * Forced dependency on GCC 3.4; LLVM really does prefer it. + * Updated 1.5cvs bits. + + -- Al Stone Wed, 25 May 2005 14:01:21 -0700 + +llvm (1.5-0a) unstable; urgency=low + + * Start preparing for the 1.5 release. + + -- Al Stone Fri, 20 May 2005 17:39:53 -0700 + +llvm (1.4-3) unstable; urgency=low + + * Closes: bug#304035 -- upstream renamed 'extract' to 'llvm-extract' to + remove conflict with /usr/bin/extract from package extract. + * Closes: bug#308694 -- missing depends for texinfo and graphviz + + -- Al Stone Thu, 19 May 2005 16:47:33 -0600 + +llvm (1.4-2) unstable; urgency=low + + * An older version of llvmc was inadvertently used; now fixed. + + -- Al Stone Fri, 11 Mar 2005 17:04:30 -0700 + +llvm (1.4-1) unstable; urgency=low + + * Initial Release. + * Closes: bug#239415 -- ITP for LLVM (Low-Level Virtual Machine) compiler + for C/C++ + + -- Al Stone Thu, 10 Mar 2005 07:31:10 -0700 + --- llvm-2.7~svn20100409.orig/debian/control +++ llvm-2.7~svn20100409/debian/control @@ -0,0 +1,130 @@ +Source: llvm +Section: devel +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: LLVM Packaging Team +Uploaders: Arthur Loiret , Pierre Habouzit +Build-Depends: debhelper (>= 6.0.0), flex, bison, dejagnu, tcl8.5, expect, + autoconf, automake1.9, perl, libtool, doxygen, chrpath, texinfo, xz-utils, + sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9), + oprofile (>= 0.9.6-1ubuntu1~ppa1), + lsb-release +Build-Conflicts: ocaml, ocaml-core, ocaml-nox +Standards-Version: 3.8.4 +Homepage: http://www.llvm.org/ +Vcs-Bzr: https://bazaar.launchpad.net/~pkg-llvm/+junk/ubuntu + +Package: libllvm2.7 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM) (runtime library) + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. + . + This package contains the LLVM runtime library. + +Package: llvm +Architecture: any +Suggests: llvm-doc +Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-dev +Description: Low-Level Virtual Machine (LLVM) + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + The strengths of the LLVM infrastructure are its extremely + simple design (which makes it easy to understand and use), + source-language independence, powerful mid-level optimizer, automated + compiler debugging support, extensibility, and its stability and + reliability. LLVM is currently being used to host a wide variety of + academic research projects and commercial projects. LLVM includes C + and C++ front-ends (based on GCC 4.0.1), a front-end for a Forth-like + language (Stacker), a young scheme front-end, and Java support is + in development. LLVM can generate code for X86, SparcV9, PowerPC, + or it can emit C code. + +Package: llvm-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, llvm (>= ${binary:Version}), oprofile +Provides: llvm-libs +Conflicts: llvm-libs +Replaces: llvm-libs, llvm (<< 2.2-3) +Description: Low-Level Virtual Machine (LLVM), libraries and headers + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package provides the libraries and headers to develop applications + using llvm. + +Package: llvm-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM), documentation + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains all documentation (extensive). + +Package: llvm-examples +Section: doc +Architecture: all +Depends: ${misc:Depends}, llvm-dev (>= ${source:Version}), llvm-dev (<< ${source:Version}+c~) +Description: Low-Level Virtual Machine (LLVM), examples + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains examples for using LLVM, both in developing + extensions to LLVM and in using it to compile code. + +Package: llvm-source +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM), source code + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains the llvm source code. + --- llvm-2.7~svn20100409.orig/debian/0004-Fix-TOOLDIR-path-for-gccas-and-gccld.patch +++ llvm-2.7~svn20100409/debian/0004-Fix-TOOLDIR-path-for-gccas-and-gccld.patch @@ -0,0 +1,57 @@ +--- + gccas/Makefile | 7 +++++-- + gccld/Makefile | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +--- a/tools/gccas/Makefile ++++ b/tools/gccas/Makefile +@@ -10,18 +10,21 @@ LEVEL = ../.. + + include $(LEVEL)/Makefile.common + ++# Debian install path ++TOOLDIR = /usr/lib/llvm/bin ++ + install-local:: $(PROJ_bindir)/gccas + + $(PROJ_bindir)/gccas : gccas.sh Makefile + $(Echo) Installing gccas shell script. +- $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@ ++ $(Verb) sed "s#@TOOLDIR@#$(TOOLDIR)#" $< > $@ + $(Verb) chmod 0755 $@ + + all-local:: $(ToolDir)/gccas + + $(ToolDir)/gccas : gccas.sh Makefile + $(Echo) Making $(ToolDir)/gccas shell script. +- $(Verb) sed "s#@TOOLDIR@#$(ToolDir)#" $< > $@ ++ $(Verb) sed "s#@TOOLDIR@#$(TOOLDIR)#" $< > $@ + $(Verb) chmod 0755 $@ + + clean-local:: +--- a/tools/gccld/Makefile ++++ b/tools/gccld/Makefile +@@ -11,18 +11,21 @@ LEVEL = ../.. + + include $(LEVEL)/Makefile.common + ++# Debian install path ++TOOLDIR = /usr/lib/llvm/bin ++ + install-local:: $(PROJ_bindir)/gccld + + $(PROJ_bindir)/gccld : gccld.sh Makefile + $(Echo) Installing gccld shell script. +- $(Verb) sed "s#@TOOLDIR@#$(PROJ_bindir)#" $< > $@ ++ $(Verb) sed "s#@TOOLDIR@#$(TOOLDIR)#" $< > $@ + $(Verb) chmod 0755 $@ + + all-local:: $(ToolDir)/gccld + + $(ToolDir)/gccld : gccld.sh Makefile + $(Echo) Making $(ToolDir)/gccld shell script. +- $(Verb) sed "s#@TOOLDIR@#$(ToolDir)#" $< > $@ ++ $(Verb) sed "s#@TOOLDIR@#$(TOOLDIR)#" $< > $@ + $(Verb) chmod 0755 $@ + + clean-local:: --- llvm-2.7~svn20100409.orig/debian/libllvm2.7.symbols +++ llvm-2.7~svn20100409/debian/libllvm2.7.symbols @@ -0,0 +1 @@ +libLLVM-2.7.so.1 libllvm2.7 #MINVER# --- llvm-2.7~svn20100409.orig/debian/patches/0011-Hurd-fixes.patch +++ llvm-2.7~svn20100409/debian/patches/0011-Hurd-fixes.patch @@ -0,0 +1,39 @@ +--- + Path.inc | 5 +++++ + Process.inc | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +--- a/lib/System/Unix/Path.inc ++++ b/lib/System/Unix/Path.inc +@@ -61,6 +61,11 @@ + #include + #endif + ++// For GNU Hurd ++#if defined(__GNU__) && !defined(MAXPATHLEN) ++# define MAXPATHLEN 4096 ++#endif ++ + // Put in a hack for Cygwin which falsely reports that the mkdtemp function + // is available when it is not. + #ifdef __CYGWIN__ +--- a/lib/System/Unix/Process.inc ++++ b/lib/System/Unix/Process.inc +@@ -134,7 +134,7 @@ + return getgid(); + } + +-#ifdef HAVE_MACH_MACH_H ++#if defined(HAVE_MACH_MACH_H) && !defined(__GNU__) + #include + #endif + +@@ -148,7 +148,7 @@ + setrlimit(RLIMIT_CORE, &rlim); + #endif + +-#ifdef HAVE_MACH_MACH_H ++#if defined(HAVE_MACH_MACH_H) && !defined(__GNU__) + // Disable crash reporting on Mac OS X 10.0-10.4 + + // get information about the original set of exception ports for the task --- llvm-2.7~svn20100409.orig/debian/patches/0010-ARM-BX_to_BLX.patch +++ llvm-2.7~svn20100409/debian/patches/0010-ARM-BX_to_BLX.patch @@ -0,0 +1,15 @@ +--- + ARMInstrInfo.td | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- ./lib/Target/ARM/ARMInstrInfo.td~ 2010-03-08 11:38:09.000000000 +0100 ++++ ./lib/Target/ARM/ARMInstrInfo.td 2010-03-08 17:21:05.493585145 +0100 +@@ -942,7 +942,7 @@ + IIC_Br, "mov\tlr, pc\n\tbx\t$func", + [(ARMcall_nolink tGPR:$func)]>, + Requires<[IsARM, HasV4T, IsNotDarwin]> { +- let Inst{7-4} = 0b0001; ++ let Inst{7-4} = 0b0011; + let Inst{19-8} = 0b111111111111; + let Inst{27-20} = 0b00010010; + } --- llvm-2.7~svn20100409.orig/debian/patches/0019-issue6065.patch +++ llvm-2.7~svn20100409/debian/patches/0019-issue6065.patch @@ -0,0 +1,21 @@ +http://llvm.org/bugs/show_bug.cgi?id=6065 + +Index: llvm/lib/Target/ARM/ARMJITInfo.cpp +=================================================================== +--- llvm.orig/lib/Target/ARM/ARMJITInfo.cpp 2010-02-03 15:46:49.000000000 +0000 ++++ llvm/lib/Target/ARM/ARMJITInfo.cpp 2010-02-03 16:11:22.000000000 +0000 +@@ -99,7 +99,13 @@ + // The above twiddling of the saved return addresses allows us to + // deallocate everything, including the LR the stub saved, all in one + // pop instruction. ++#ifndef __thumb__ + "ldmia sp!, {r0, r1, r2, r3, lr, pc}\n" ++#else ++ // thumb dont allow lr and pc to be poped in the same instruction. ++ "pop {r0, r1, r2, r3, lr}\n" ++ "pop {pc}\n" ++#endif + ); + #else // Not an ARM host + void ARMCompilationCallback() { + --- llvm-2.7~svn20100409.orig/debian/patches/0002-Fix-llvm-config-script.patch +++ llvm-2.7~svn20100409/debian/patches/0002-Fix-llvm-config-script.patch @@ -0,0 +1,34 @@ +--- ./tools/llvm-config/llvm-config.in.in.orig 2010-03-30 15:14:08.611086468 +0000 ++++ ./tools/llvm-config/llvm-config.in.in 2010-03-30 15:15:35.843585892 +0000 +@@ -66,6 +66,9 @@ + + my $INCLUDEDIR = "$ABS_RUN_DIR/include"; + my $INCLUDEOPTION = "-I$INCLUDEDIR"; ++if ($INCLUDEDIR eq "/usr/include") { ++ $INCLUDEOPTION = ""; ++} + my $LIBDIR = "$ABS_RUN_DIR/lib"; + my $BINDIR = "$ABS_RUN_DIR/bin"; + if ($ABS_RUN_DIR eq $ABS_OBJ_ROOT) { +@@ -76,8 +79,10 @@ + $INCLUDEOPTION = "-I$INCLUDEDIR -I$LLVM_OBJ_ROOT/include" + } else { + # If installed, ignore the prefix the tree was configured with, use the +- # current prefix. +- $PREFIX = $ABS_RUN_DIR; ++ # Debian dirs. ++ $PREFIX = "/usr/lib/llvm"; ++ $LIBDIR = "/usr/lib/llvm/lib"; ++ $BINDIR = "/usr/bin"; + } + + sub usage; +@@ -154,7 +159,7 @@ + # Handle any arguments which require building our dependency graph. + if ($want_libs || $want_libnames || $want_libfiles) { + my @libs = expand_dependencies(@components); +- print join(' ', fix_library_names(@libs)), "\n" if ($want_libs); ++ print join(' ', fix_library_names(@libs)), " -L$LIBDIR\n" if ($want_libs); + print join(' ', @libs), "\n" if ($want_libnames); + print join(' ', fix_library_files(@libs)), "\n" if ($want_libfiles); + } --- llvm-2.7~svn20100409.orig/debian/patches/0021-shared-lib-debian.patch +++ llvm-2.7~svn20100409/debian/patches/0021-shared-lib-debian.patch @@ -0,0 +1,23 @@ +--- ./tools/llvm-shlib/Makefile.orig 2010-02-26 07:19:39.974835955 +0100 ++++ ./tools/llvm-shlib/Makefile 2010-02-26 07:47:00.481086486 +0100 +@@ -26,6 +26,12 @@ + LLVMLibsPaths := $(IncludeInLibLlvm) + + $(LibName.SO): $(LLVMLibsPaths) ++ $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ ++ $(LIBRARYNAME)$(SHLIBEXT) ++ $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ ++ $(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS) ++ mv $(LibName.SO) $(LibName.SO).1 ++ ln -s $(notdir $(LibName.SO)).1 $(LibName.SO) + + ifeq ($(HOST_OS),Darwin) + # set dylib internal version number to llvmCore submission number +@@ -55,6 +61,7 @@ + # Include everything from the .a's into the shared library. + LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ + -Wl,--no-whole-archive ++ LLVMLibsOptions += -Wl,--soname=$(notdir $(LibName.SO)).1 -Wl,-Bsymbolic-functions + # Don't allow unresolved symbols. + LLVMLibsOptions += -Wl,--no-undefined + endif --- llvm-2.7~svn20100409.orig/debian/patches/0008-path-eraseFromDisk.patch +++ llvm-2.7~svn20100409/debian/patches/0008-path-eraseFromDisk.patch @@ -0,0 +1,38 @@ +--- + Path.inc | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +--- a/lib/System/Unix/Path.inc ++++ b/lib/System/Unix/Path.inc +@@ -57,6 +57,10 @@ + #include + #endif + ++#if HAVE_UNISTD_H ++#include ++#endif ++ + // Put in a hack for Cygwin which falsely reports that the mkdtemp function + // is available when it is not. + #ifdef __CYGWIN__ +@@ -731,9 +735,18 @@ + } + + if (remove_contents) { ++ int rv; + // Recursively descend the directory to remove its contents. +- std::string cmd = "/bin/rm -rf " + path; +- if (system(cmd.c_str()) != 0) { ++ switch (fork()) { ++ case -1: ++ return MakeErrMsg(ErrStr, path + ": failed to fork (recursively removing directory)."); ++ case 0: ++ execl("/bin/rm", "/bin/rm", "-rf", "--", path.c_str(), (char *) 0); ++ exit(1); ++ default: ++ wait(&rv); ++ } ++ if (rv != 0) { + MakeErrMsg(ErrStr, path + ": failed to recursively remove directory."); + return true; + } --- llvm-2.7~svn20100409.orig/debian/patches/0005-Disable-llvm-stub.patch +++ llvm-2.7~svn20100409/debian/patches/0005-Disable-llvm-stub.patch @@ -0,0 +1,15 @@ +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- ./tools/Makefile~ 2010-03-08 11:38:05.000000000 +0100 ++++ ./tools/Makefile 2010-03-08 17:15:17.984835181 +0100 +@@ -20,7 +20,7 @@ + llc llvm-ranlib llvm-ar llvm-nm \ + llvm-ld llvm-prof llvm-link \ + lli llvm-extract \ +- bugpoint llvm-bcanalyzer llvm-stub \ ++ bugpoint llvm-bcanalyzer \ + llvm-mc llvmc + + --- llvm-2.7~svn20100409.orig/debian/patches/0011-gcc-4.4-thumb.patch +++ llvm-2.7~svn20100409/debian/patches/0011-gcc-4.4-thumb.patch @@ -0,0 +1,9 @@ +--- ./lib/ExecutionEngine/Interpreter/Makefile.orig 2010-02-02 22:29:41.000000000 +0000 ++++ ./lib/ExecutionEngine/Interpreter/Makefile 2010-02-03 23:52:24.000000000 +0000 +@@ -11,3 +11,6 @@ + LIBRARYNAME = LLVMInterpreter + + include $(LEVEL)/Makefile.common ++ ++CXX.Flags += -Os ++C.Flags += -Os --- llvm-2.7~svn20100409.orig/debian/patches/0001-Update-configure-script-for-kfreebsd-gnu-and-hurd.patch +++ llvm-2.7~svn20100409/debian/patches/0001-Update-configure-script-for-kfreebsd-gnu-and-hurd.patch @@ -0,0 +1,27 @@ +--- + configure | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/configure ++++ b/configure +@@ -2293,7 +2293,7 @@ else + llvm_cv_no_link_all_option="-Wl,-noall_load" + llvm_cv_os_type="Darwin" + llvm_cv_platform_type="Unix" ;; +- *-*-freebsd*) ++ *-*-freebsd* | *-*-kfreebsd-gnu) + llvm_cv_link_all_option="-Wl,--whole-archive" + llvm_cv_no_link_all_option="-Wl,--no-whole-archive" + llvm_cv_os_type="FreeBSD" +@@ -2328,6 +2328,11 @@ else + llvm_cv_no_link_all_option="-Wl,--no-whole-archive" + llvm_cv_os_type="Linux" + llvm_cv_platform_type="Unix" ;; ++ *-*-gnu*) ++ llvm_cv_link_all_option="-Wl,--whole-archive" ++ llvm_cv_no_link_all_option="-Wl,--no-whole-archive" ++ llvm_cv_os_type="GNU" ++ llvm_cv_platform_type="Unix" ;; + *-*-solaris*) + llvm_cv_link_all_option="-Wl,-z,allextract" + llvm_cv_no_link_all_option="-Wl,-z,defaultextract" --- llvm-2.7~svn20100409.orig/debian/patches/0023-link-libopagent.patch +++ llvm-2.7~svn20100409/debian/patches/0023-link-libopagent.patch @@ -0,0 +1,31 @@ +--- ./configure.orig 2010-03-30 15:56:04.634836889 +0200 ++++ ./configure 2010-03-30 16:01:23.571085413 +0200 +@@ -14140,7 +14140,7 @@ + CPPFLAGS="-I${withval}/include";; + esac + if test -n "$llvm_cv_oppath" ; then +- LIBS="$LIBS -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}" ++ #LIBS="$LIBS -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}" + { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5 + echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; } + if test "${ac_cv_search_bfd_init+set}" = set; then +@@ -14236,7 +14236,7 @@ + echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; } + ac_res=$ac_cv_search_bfd_init + if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ test "$ac_res" = "none required" || true + + fi + +@@ -14272,8 +14272,8 @@ + if test -z "$ac_lib"; then + ac_res="none required" + else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed" ++ LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" --- llvm-2.7~svn20100409.orig/debian/patches/0009-Fix-doclinks.patch +++ llvm-2.7~svn20100409/debian/patches/0009-Fix-doclinks.patch @@ -0,0 +1,57 @@ +--- + index.html | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +--- ./docs/index.html~ 2010-02-26 07:19:39.000000000 +0100 ++++ ./docs/index.html 2010-02-27 12:47:58.261089172 +0100 +@@ -70,31 +70,31 @@ + Microsoft Visual Studio - An addendum to the main Getting Started guide for + those using Visual Studio on Windows. + +-
  • LLVM Tutorial - A walk through the process of using ++
  • LLVM Tutorial - A walk through the process of using + LLVM for a custom language, and the facilities LLVM offers in tutorial form.
    • +
  • Developer Policy - The LLVM project's + policy towards developers and their contributions.
    • + +-
  • LLVM Command Guide - A reference ++
  • LLVM Command Guide - A reference + manual for the LLVM command line utilities ("man" pages for LLVM tools).
    + Current tools: +- llvm-ar, +- llvm-as, +- llvm-dis, +- llvm-extract, +- llvm-ld, +- llvm-link, +- llvm-nm, +- llvm-prof, +- llvm-ranlib, +- opt, +- llc, +- lli, +- llvmc +- llvm-gcc, +- llvm-g++, +- bugpoint, +- llvm-bcanalyzer, ++ llvm-ar, ++ llvm-as, ++ llvm-dis, ++ llvm-extract, ++ llvm-ld, ++ llvm-link, ++ llvm-nm, ++ llvm-prof, ++ llvm-ranlib, ++ opt, ++ llc, ++ lli, ++ llvmc ++ llvm-gcc, ++ llvm-g++, ++ bugpoint, ++ llvm-bcanalyzer, +
    • + +
  • LLVM's Analysis and Transform Passes - A list of --- llvm-2.7~svn20100409.orig/debian/patches/0003-Debian-version-info-and-bugreport.patch +++ llvm-2.7~svn20100409/debian/patches/0003-Debian-version-info-and-bugreport.patch @@ -0,0 +1,40 @@ +--- + Makefile.rules | 2 +- + configure | 2 +- + lib/Support/CommandLine.cpp | 3 +++ + 3 files changed, 5 insertions(+), 2 deletions(-) + +--- ./Makefile.rules.orig 2010-02-02 22:29:48.651088287 +0000 ++++ ./Makefile.rules 2010-02-02 22:52:39.891089973 +0000 +@@ -686,7 +686,7 @@ + $(patsubst %,-I%/include,\ + $(PROJ_OBJ_ROOT) $(PROJ_SRC_ROOT) \ + $(LLVM_OBJ_ROOT) $(LLVM_SRC_ROOT))) \ +- $(CPP.BaseFlags) ++ $(CPP.BaseFlags) $(DebianOpts) + + ifeq ($(BUILD_COMPONENT), 1) + Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ +--- ./configure.orig 2010-02-02 22:29:48.000000000 +0000 ++++ ./configure 2010-02-02 22:55:42.951086381 +0000 +@@ -563,7 +563,7 @@ + PACKAGE_TARNAME='-llvm-' + PACKAGE_VERSION='2.7' + PACKAGE_STRING='llvm 2.7' +-PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu' ++PACKAGE_BUGREPORT='https://bugs.launchpad.net/ubuntu/+source/llvm/+bugs' + + ac_unique_file="lib/VMCore/Module.cpp" + # Factoring default headers for most tests. +--- ./lib/Support/CommandLine.cpp.orig 2010-02-02 22:29:42.000000000 +0000 ++++ ./lib/Support/CommandLine.cpp 2010-02-02 22:54:03.031090022 +0000 +@@ -1158,6 +1158,9 @@ + #ifdef LLVM_VERSION_INFO + OS << LLVM_VERSION_INFO; + #endif ++#ifdef LLVM_DEBIAN_INFO ++ OS << LLVM_DEBIAN_INFO; ++#endif + OS << "\n "; + #ifndef __OPTIMIZE__ + OS << "DEBUG build"; --- llvm-2.7~svn20100409.orig/debian/packages.d/tools.mk +++ llvm-2.7~svn20100409/debian/packages.d/tools.mk @@ -0,0 +1,31 @@ +builds := $(PKGSOURCE) +packages := $(PKGSOURCE) + +ifeq (,$(findstring $(PKGSOURCE),$(tools))) + $(error unsupported tool) +endif + +BUILDDEPS := llvm-dev (>= $(dev_version)), llvm-source (>= $(dev_version)) +PF := /usr + +patchdirs := /usr/src/llvm/patches + +confargs += \ + --prefix=$(PF) + +MAKEOPTS += \ + VERBOSE=1 \ + DebianOpts="-DLLVM_DEBIAN_INFO='\" ($(OS) $(VERSION))\"'" \ + ONLY_TOOLS="$(PKGSOURCE)" + +tarpath := $(firstword $(wildcard $(D)/llvm-$(UVERSION)*.tar.* \ + /usr/src/llvm/llvm-$(UVERSION)*.tar.*)) +tarball := $(notdir $(tarpath)) +srcdir := $(subst -dfsg,,$(subst .tar$(suffix $(tarball)),,$(tarball))) + +define $(PKGSOURCE)_extra_unpack + for tool in $(notdir $(wildcard $(D)/tools/*)) ; do \ + ln -sf $(D)/tools/$$tool $(D)/$(srcdir)/tools/$$tool ; \ + done +endef + --- llvm-2.7~svn20100409.orig/debian/packages.d/llvm-snapshot.mk +++ llvm-2.7~svn20100409/debian/packages.d/llvm-snapshot.mk @@ -0,0 +1,33 @@ +builds := llvm-core llvm-tools +packages := llvm-snapshot + +PF := /usr/lib/llvm-snapshot + +confargs += \ + --prefix=$(PF) + +MAKEOPTS += \ + VERBOSE=1 \ + DebianOpts="-DLLVM_DEBIAN_INFO='\" ($(OS) $(VERSION))\"'" + +check_archs := amd64 i386 ia64 powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 +ifneq (,$(filter $(DEB_HOST_ARCH),$(check_archs))) + with_check := yes +endif + +define llvm-snapshot_extra_binary + if test "x$*" = "xllvm-snapshot" ; then \ + sed -r 's/^(my\s+\$$LLVM_SRC_ROOT\s+=\s+q)\{(.*)\}\;$$/\1\{$(subst /,\/,$(PF))\/build\}\;/' \ + -i $(D)/debian/$*/$(PF)/bin/llvm-config ; \ + sed -r 's/^(my\s+\$$LLVM_OBJ_ROOT\s+=\s+q)\{(.*)\}\;$$/\1\{$(subst /,\/,$(PF))\/build\}\;/' \ + -i $(D)/debian/$*/$(PF)/bin/llvm-config ; \ + sed -r 's/^(LLVM_SRC_ROOT\s+\:\=\s+\$$\(shell cd).*\; \$$\(PWD\)\)$$/\1 $(subst /,\/,$(PF))\/build \; \$$\(PWD\)\)/' \ + -i $(D)/debian/$*/$(PF)/build/Makefile.config ; \ + sed -r 's/^(LLVM_OBJ_ROOT\s+\:\=\s+\$$\(shell cd).*\; \$$\(PWD\)\)$$/\1 $(subst /,\/,$(PF))\/build \; \$$\(PWD\)\)/' \ + -i $(D)/debian/$*/$(PF)/build/Makefile.config ; \ + sed -r "s/^(ac_pwd\=)'.*'$$/\1'$(subst /,\/,$(PF))\/build'/" \ + -i $(D)/debian/$*/$(PF)/build/config.status ; \ + find $(D)/debian/$* -type f -name "LICENSE.TXT" | xargs rm -f ; \ + fi +endef + --- llvm-2.7~svn20100409.orig/debian/packages.d/llvm.mk +++ llvm-2.7~svn20100409/debian/packages.d/llvm.mk @@ -0,0 +1,85 @@ +builds := llvm-core llvm-tools +packages := libllvm2.7 llvm llvm-dev llvm-doc llvm-examples llvm-source + +export REQUIRES_RTTI=1 + +ifneq (,$(findstring $(DEB_HOST_GNU_CPU),ia64 mips mipsel)) + $(error unsupported processor) +endif + +confargs += \ + --prefix=$(PF) + +MAKEOPTS += \ + VERBOSE=1 \ + DebianOpts="-DLLVM_DEBIAN_INFO='\" ($(OS) $(VERSION))\"'" + +check_archs := amd64 armel i386 ia64 powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 +ifneq (,$(filter $(DEB_HOST_ARCH),$(check_archs))) + with_check := yes +endif + +define llvm_extra_binary + if test "x$*" = "xllvm" ; then \ + $(RM) $(D)/debian/$*.links ; \ + for i in $$(ls $(D)/debian/tmp/$(PF)/bin); do \ + echo "$(PF)/bin/$$i usr/bin/$$i" >> $(D)/debian/$*.links ; \ + done ; \ + sed -r 's/^(my\s+\$$LLVM_SRC_ROOT\s+=\s+q)\{(.*)\}\;$$/\1\{$(subst /,\/,$(PF))\/build\}\;/' \ + -i $(D)/debian/$*/$(PF)/bin/llvm-config ; \ + sed -r 's/^(my\s+\$$LLVM_OBJ_ROOT\s+=\s+q)\{(.*)\}\;$$/\1\{$(subst /,\/,$(PF))\/build\}\;/' \ + -i $(D)/debian/$*/$(PF)/bin/llvm-config ; \ + fi +endef + +define llvm-dev_extra_binary + if test "x$*" = "xllvm-dev" ; then\ + sed -r 's/^(LLVM_SRC_ROOT\s+\:\=\s+\$$\(shell cd).*\; \$$\(PWD\)\)$$/\1 $(subst /,\/,$(PF))\/build \; \$$\(PWD\)\)/' \ + -i $(D)/debian/$*/$(PF)/build/Makefile.config ; \ + sed -r 's/^(LLVM_OBJ_ROOT\s+\:\=\s+\$$\(shell cd).*\; \$$\(PWD\)\)$$/\1 $(subst /,\/,$(PF))\/build \; \$$\(PWD\)\)/' \ + -i $(D)/debian/$*/$(PF)/build/Makefile.config ; \ + sed -r "s/^(ac_pwd\=)'.*'$$/\1'$(subst /,\/,$(PF))\/build'/" \ + -i $(D)/debian/$*/$(PF)/build/config.status ; \ + chmod 644 $(D)/debian/$*/$(PF)/build/Makefile* ; \ + find $(D)/debian/$* -type f -name "LICENSE.TXT" | xargs rm -f ; \ + cp $(D)/utils/vim/README $(D)/debian/$*/usr/share/doc/$*/README.vim ; \ + cp $(D)/utils/emacs/README $(D)/debian/$*/usr/share/doc/$*/README.emacs ; \ + sed -r 's/path-to-llvm\/utils\/emacs/\/usr\/share\/emacs\/site-lisp\/llvm/' \ + -i $(D)/debian/$*/usr/share/doc/$*/README.emacs ; \ + rm -f $(D)/debian/$*/usr/lib/llvm/lib/libLLVM*.so.*; \ + fi +endef + +define llvm-source_extra_binary + if test "x$*" = "xllvm-source" ; then \ + rm -rf $(D)/debian/$*/usr/src/llvm ; \ + mkdir -p $(D)/debian/$*/usr/src/llvm ; \ + cp -f ../$(PKGSOURCE)_$(UVERSION).orig.tar.gz \ + $(D)/debian/$*/usr/src/llvm/$(PKGSOURCE)-$(UVERSION).tar.gz ; \ + gunzip $(D)/debian/$*/usr/src/llvm/$(PKGSOURCE)-$(UVERSION).tar.gz ; \ + xz $(D)/debian/$*/usr/src/llvm/$(PKGSOURCE)-$(UVERSION).tar ; \ + cp -r $(D)/debian/patches $(D)/debian/$*/usr/src/llvm/ ; \ + fi +endef + +define llvm-core_extra_install + if test "x$*" = "xllvm-core" ; then \ + mv $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so \ + $(D)/debian/tmp/usr/lib/$(shlib_name).so.1; \ + ln -s $(shlib_name).so.1 $(D)/debian/tmp/usr/lib/$(shlib_name).so; \ + ln -sf ../../$(shlib_name).so.1 $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so.1; \ + ln -s $(shlib_name).so.1 $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so; \ + fi +endef + +# why twice? +define llvm-tools_extra_install + if test "x$*" = "xllvm-tools" ; then \ + mv $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so \ + $(D)/debian/tmp/usr/lib/$(shlib_name).so.1; \ + ln -s $(shlib_name).so.1 $(D)/debian/tmp/usr/lib/$(shlib_name).so; \ + ln -sf ../../$(shlib_name).so.1 $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so.1; \ + ln -s $(shlib_name).so.1 $(D)/debian/tmp/usr/lib/llvm/lib/$(shlib_name).so; \ + fi +endef + --- llvm-2.7~svn20100409.orig/debian/packages.d/llvm-gcc-4.2.mk +++ llvm-2.7~svn20100409/debian/packages.d/llvm-gcc-4.2.mk @@ -0,0 +1,30 @@ +builds := llvm-gcc +packages := llvm-gcc + +BUILDDEPS := llvm-dev (>= $(dev_version)) + +confargs += \ + --prefix=$(PF)/gcc-$(gcc_version) --enable-llvm=$(PF) \ + --enable-languages=c,c++ --program-prefix=llvm- \ + --enable-threads --disable-nls --disable-shared \ + --disable-multilib + +check_archs := amd64 i386 +ifneq (,$(filter $(DEB_HOST_ARCH),$(check_archs))) + with_check := yes +endif + +tarpath := $(firstword $(wildcard $(D)/llvm-gcc-$(gcc_version)-$(UVERSION)*.tar.* \ + /usr/src/llvm/llvm-gcc-$(gcc_version)-$(UVERSION)*.tar.*)) +tarball := $(notdir $(tarpath)) +srcdir := $(subst -dfsg,,$(subst .tar$(suffix $(tarball)),,$(tarball))) + +define llvm-gcc-4.2_extra_binary + if test "x$*" = "xllvm-gcc-4.2" ; then \ + $(RM) $(D)/debian/$*.links ; \ + for i in $$(ls $(D)/debian/tmp/$(PF)/gcc-$(gcc_version)/bin); do \ + echo "$(PF)/gcc-$(gcc_version)/bin/$$i usr/bin/$$i" >> $(D)/debian/$*.links ; \ + done ; \ + fi +endef + --- llvm-2.7~svn20100409.orig/debian/rules.d/unpack.mk +++ llvm-2.7~svn20100409/debian/rules.d/unpack.mk @@ -0,0 +1,54 @@ +unpack: $(unpack-stamp) +$(unpack-stamp): $(addprefix $(unpack-stamp)-,$(tarball)) + mkdir -p $(@D) + touch $@ + +$(unpack-stamp)-%: + test -d $(stampdir) || mkdir $(stampdir) + if ! test -z "$(tarball)" ; then \ + $(RM) -r $(srcdir) ; \ + case $(tarball) in \ + *.bz2) tar -x --bzip2 -f $(tarpath);; \ + *.gz) tar -x --gzip -f $(tarpath);; \ + *.lzma) lzcat $(tarpath) | tar -x -f -;; \ + *.xz) xzcat $(tarpath) | tar -x -f -;; \ + *) false;; \ + esac ; \ + fi + $(call $(PKGSOURCE)_extra_unpack) + touch $@ + +patches := $(foreach patchdir,$(patchdirs),$(wildcard $(patchdir)/*.patch)) + +patches_rev := # nothing +$(foreach patch,$(patches),$(eval patches_rev := $(patch) $(patches_rev))) + +patch: $(patch-stamp) +$(patch-stamp): $(unpack-stamp) + test -d $(stampdir)/patches || mkdir -p $(stampdir)/patches + cd $(srcdir) && for patch in $(patches) ; do \ + if ! test -f $(stampdir)/patches/$$(echo $$patch | tr "/" "_") ; then \ + echo "Checking patch: $$patch"; \ + if ! patch -p1 --dry-run < $$patch ; then \ + exit 1; \ + fi; \ + echo "Applying patch: $$patch" && patch -p1 < $$patch && \ + touch $(stampdir)/patches/$$(echo $$patch | tr "/" "_") ; \ + fi ; \ + done + touch $@ + +unpatch: + test -d $(stampdir)/patches || mkdir -p $(stampdir)/patches + cd $(srcdir) && for patch in $(patches_rev) ; do \ + if test -f $(stampdir)/patches/$$(echo $$patch | tr "/" "_") ; \ + then echo "Reverting patch: $$patch" && patch -p1 -R < $$patch && \ + $(RM) $(stampdir)/patches/$$(echo $$patch | tr "/" "_") ; \ + fi ; \ + done + $(RM) $(patch-stamp) + $(RM) -r $(stampdir)/patches + +clean: unpatch + +.PHONY: clean unpack patch unpatch --- llvm-2.7~svn20100409.orig/debian/rules.d/binary.mk +++ llvm-2.7~svn20100409/debian/rules.d/binary.mk @@ -0,0 +1,53 @@ +binary-indep binary-arch: $(build-stamp) $(install-stamp) +binary-arch: $(addprefix $(binary-stamp)-,$(packages_arch)) +binary-indep: $(addprefix $(binary-stamp)-,$(packages_indep)) +binary: binary-arch binary-indep + dh_install --list-missing 2>&1 + +debhelper-%: + $(foreach f,$(notdir $(wildcard $(D)/debian/debhelper.in/$*.*)),\ + sed -e "s;@PF@;$(PF);g" \ + -e "s;@GCC_VERSION@;$(GCC_VERSION);g" \ + -e "s;@LLVM_VERSION@;$(LLVM_VERSION);g" \ + -e "s/@PKG_VERSION@/$(pkg_version)/g" \ + -e "s/@SHLIB_NAME@/$(shlib_name)/g" \ + $(D)/debian/debhelper.in/$f > $(D)/debian/$f &&) : + +clean: clean-debhelper +clean-debhelper: clean-common + $(RM) $(addprefix debian/,$(notdir $(wildcard $(D)/debian/debhelper.in/*))) + +.PHONY: clean clean-debhelper + +$(binary-stamp)-%: $(install-stamp) debhelper-% + @echo Building package: $* + dh_testdir + dh_testroot + dh_installchangelogs -p$* + dh_installdocs -p$* + dh_installexamples -p$* + dh_installman -p$* + dh_installmime -p$* + dh_install -p$* + for dir in lib libexec bin ; \ + do for i in $$(find $(D)/debian/$*/$(PF)/$$dir 2>/dev/null || echo -n) ; \ + do if objdump -p $$i 2>/dev/null | grep RPATH 2>&1 >/dev/null ; \ + then echo "Removing hardcoded path library from $$i" ; \ + chrpath -d $$i || true ; \ + fi ; \ + done ; \ + done + $(call $*_extra_binary) + dh_link -p$* + dh_strip -p$* + dh_compress -p$* + dh_fixperms -p$* + dh_makeshlibs -p$* + dh_installdeb -p$* + dh_shlibdeps -p$* + dh_gencontrol -p$* + dh_md5sums -p$* + dh_builddeb -p$* + touch $@ + +.PHONY: binary binary-arch binary-indep debhelper-% --- llvm-2.7~svn20100409.orig/debian/rules.d/vars.mk +++ llvm-2.7~svn20100409/debian/rules.d/vars.mk @@ -0,0 +1,54 @@ +DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution | sed -e 's/^Distribution: //') +PKGSOURCE := $(shell dpkg-parsechangelog | grep ^Source | sed -e 's/^Source: //') +VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -e 's/^Version: //') +# when building snapshots, this version has the ~ included +UVERSION := $(shell echo $(VERSION) | cut -d'-' -f1) +#UVERSION := $(shell echo $(VERSION) | cut -d'~' -f1 | cut -d'-' -f1) +PF := /usr/lib/llvm +D := $(CURDIR) + +pkg_version := $(shell sed -n "/^PACKAGE_VERSION=/s/.*'\(.*\)'$$/\1/p" configure) +pkg_version := $(subst svn,,$(pkg_version)) +shlib_name := libLLVM-$(pkg_version) + +# for llvm-gcc and tools +dev_version := $(UVERSION)-6 + +$(foreach var,$(shell dpkg-architecture | sed -e 's/=/?=/'),$(eval $(var))) + +stampdir := $(D)/debian/stamps +$(foreach target,control unpack patch configure build check install binary, \ + $(eval $(target)-stamp := $(stampdir)/$(target)-stamp)) + +packages_indep := $(strip $(shell dh_listpackages -i 2>/dev/null)) +packages_all := $(strip $(shell dh_listpackages -s 2>/dev/null)) +packages_arch := $(filter-out $(packages_indep),$(packages_all)) + +NJOBS := 1 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else + # disabled + ifeq (0,1) + NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + NJOBS := $(shell if test $(NCPUS) -gt 1; then echo `expr $(NCPUS) + 1`; \ + else echo $(NCPUS); fi) + endif +endif + +confargs := \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --enable-pic \ + --enable-optimized \ + --enable-libffi \ + --enable-debug-symbols \ + --disable-assertions \ + --with-oprofile \ + --enable-shared + +#ifneq (,$(filter $(DEB_HOST_ARCH), armel)) +# confargs += --with-extra-options=-marm +#endif + +with_check := no + --- llvm-2.7~svn20100409.orig/debian/rules.d/build.mk +++ llvm-2.7~svn20100409/debian/rules.d/build.mk @@ -0,0 +1,65 @@ +configure: $(configure-stamp) +$(configure-stamp): $(addprefix $(configure-stamp)-,$(builds)) + touch $@ + +build: $(build-stamp) +$(build-stamp): $(addprefix $(build-stamp)-,$(builds)) + touch $@ + +do_check := $(if $(findstring yes,$(with_check)),$(check-stamp),) + +install: $(install-stamp) +$(install-stamp): $(do_check) $(addprefix $(install-stamp)-,$(builds)) + touch $@ + +check: $(check-stamp) +$(check-stamp): + chmod +x $(D)/debian/logwatch.sh + -debian/logwatch.sh -t 900 -p $(D)/debian/logwatch.pid \ + -m '\ntestsuite still running ...\n' \ + $(D)/debian/log-check \ + & + @echo BEGIN-testsuite + -$(MAKE) -C $(builddir) check 2>&1 | tee $(D)/debian/log-check + @echo END-testsuite + $(call $*_extra_check) + touch $@ + +clean: clean-common +clean-common: + dh_testdir + dh_testroot + dh_clean + $(RM) $(D)/debian/log-check $(D)/debian/logwatch.pid + $(RM) log-* missing + +.PHONY: configure build install check clean clean-common + +# GENERIC ------------------- +$(configure-stamp)-%: $(unpack-stamp) $(patch-stamp) + -mkdir -p $(builddir) 2>/dev/null + cd $(builddir) && \ + ../$(srcdir)/configure $(confargs) + $(call $*_extra_configure) + touch $@ +$(build-stamp)-%: $(configure-stamp)-% + $(MAKE) -j$(NJOBS) -C $(builddir) $(MAKEOPTS) + $(call $*_extra_build) + touch $@ +$(install-stamp)-%: $(build-stamp)-% + $(MAKE) -C $(builddir) $(MAKEOPTS) install DESTDIR=$(D)/debian/tmp + $(call $*_extra_install) + touch $@ + +# llvm ---------------------- +$(configure-stamp)-llvm-%: $(configure-stamp-llvm) + touch $@ +$(build-stamp)-llvm-core: $(configure-stamp)-llvm + $(MAKE) -j$(NJOBS) -C $(builddir) $(MAKEOPTS) ONLY_TOOLS="" + touch $@ +$(build-stamp)-llvm-tools: $(configure-stamp)-llvm + $(MAKE) -j$(NJOBS) -C $(builddir) $(MAKEOPTS) + touch $@ +$(install-stamp)-llvm-%: $(build-stamp)-llvm-% $(install-stamp)-llvm + touch $@ + --- llvm-2.7~svn20100409.orig/debian/rules.d/control.mk +++ llvm-2.7~svn20100409/debian/rules.d/control.mk @@ -0,0 +1,19 @@ +ifneq (,$(strip $(BUILDDEPS))) + BUILDDEPS:=, $(BUILDDEPS) +endif + +debian/control: + @echo Regenerating control file... + sed -e "s/@PKGSOURCE@/$(PKGSOURCE)/g" \ + -e "s/ *@BUILDDEPS@/$(BUILDDEPS)/g" \ + -e "s/@UVERSION@/$(UVERSION)/g" \ + -e "s/@GCC_VERSION@/$(gcc_version)/g" \ + -e "s/@PKG_VERSION@/$(pkg_version)/g" \ + -e "s/@SHLIB_NAME@/$(shlib_name)/g" \ + $@.in/source $(addprefix $@.in/,$(packages)) > $@ + +control: debian/control + +clean: control + +.PHONY: clean control debian/control --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-source +++ llvm-2.7~svn20100409/debian/control.in/llvm-source @@ -0,0 +1,17 @@ +Package: llvm-source +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM), source code + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains the llvm source code. + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-snapshot +++ llvm-2.7~svn20100409/debian/control.in/llvm-snapshot @@ -0,0 +1,18 @@ +Package: llvm-snapshot +Architecture: any +Suggests: llvm-doc +Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} +Description: a SNAPSHOT of the Low-Level Virtual Machine (LLVM) + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package is a SNAPSHOT taken from the upstream SVN. + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-gcc +++ llvm-2.7~svn20100409/debian/control.in/llvm-gcc @@ -0,0 +1,22 @@ +Package: llvm-gcc-@GCC_VERSION@ +Architecture: i386 amd64 +Depends: llvm-dev (>= @UVERSION@), llvm (>= @UVERSION@), ${shlibs:Depends}, ${misc:Depends} +Provides: llvm-gcc, llvm-cfe +Suggests: gcc-@GCC_VERSION@-doc +Description: Low-Level Virtual Machine (LLVM), C/C++ front-end + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This is only a utility package that contains the C/C++ front-end + used by the compiler, and was created in order to reduce the overall + size of the compiler package itself. Please install the 'llvm' + package to install the actual compiler. + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-doc +++ llvm-2.7~svn20100409/debian/control.in/llvm-doc @@ -0,0 +1,18 @@ +Package: llvm-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM), documentation + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains all documentation (extensive). + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm +++ llvm-2.7~svn20100409/debian/control.in/llvm @@ -0,0 +1,28 @@ +Package: llvm +Architecture: any +Suggests: llvm-doc +Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-dev +Description: Low-Level Virtual Machine (LLVM) + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + The strengths of the LLVM infrastructure are its extremely + simple design (which makes it easy to understand and use), + source-language independence, powerful mid-level optimizer, automated + compiler debugging support, extensibility, and its stability and + reliability. LLVM is currently being used to host a wide variety of + academic research projects and commercial projects. LLVM includes C + and C++ front-ends (based on GCC 4.0.1), a front-end for a Forth-like + language (Stacker), a young scheme front-end, and Java support is + in development. LLVM can generate code for X86, SparcV9, PowerPC, + or it can emit C code. + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-examples +++ llvm-2.7~svn20100409/debian/control.in/llvm-examples @@ -0,0 +1,19 @@ +Package: llvm-examples +Section: doc +Architecture: all +Depends: ${misc:Depends}, llvm-dev (>= ${source:Version}), llvm-dev (<< ${source:Version}+c~) +Description: Low-Level Virtual Machine (LLVM), examples + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package contains examples for using LLVM, both in developing + extensions to LLVM and in using it to compile code. + --- llvm-2.7~svn20100409.orig/debian/control.in/source +++ llvm-2.7~svn20100409/debian/control.in/source @@ -0,0 +1,16 @@ +Source: @PKGSOURCE@ +Section: devel +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: LLVM Packaging Team +Uploaders: Arthur Loiret , Pierre Habouzit +Build-Depends: debhelper (>= 6.0.0), flex, bison, dejagnu, tcl8.5, expect, + autoconf, automake1.9, perl, libtool, doxygen, chrpath, texinfo, xz-utils, + sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9), + oprofile (>= 0.9.6-1ubuntu1~ppa1), + lsb-release @BUILDDEPS@ +Build-Conflicts: ocaml, ocaml-core, ocaml-nox +Standards-Version: 3.8.4 +Homepage: http://www.llvm.org/ +Vcs-Bzr: https://bazaar.launchpad.net/~pkg-llvm/+junk/ubuntu + --- llvm-2.7~svn20100409.orig/debian/control.in/llvm-dev +++ llvm-2.7~svn20100409/debian/control.in/llvm-dev @@ -0,0 +1,21 @@ +Package: llvm-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, llvm (>= ${binary:Version}), oprofile +Provides: llvm-libs +Conflicts: llvm-libs +Replaces: llvm-libs, llvm (<< 2.2-3) +Description: Low-Level Virtual Machine (LLVM), libraries and headers + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + This package provides the libraries and headers to develop applications + using llvm. + --- llvm-2.7~svn20100409.orig/debian/control.in/libllvm2.7 +++ llvm-2.7~svn20100409/debian/control.in/libllvm2.7 @@ -0,0 +1,11 @@ +Package: libllvm@PKG_VERSION@ +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Low-Level Virtual Machine (LLVM) (runtime library) + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. + . + This package contains the LLVM runtime library. + --- llvm-2.7~svn20100409.orig/debian/control.in/clang +++ llvm-2.7~svn20100409/debian/control.in/clang @@ -0,0 +1,40 @@ +Package: clang +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-dev +Description: Low-Level Virtual Machine (LLVM), C language family frontend + The Low-Level Virtual Machine (LLVM) is a collection of libraries and + tools that make it easy to build compilers, optimizers, Just-In-Time + code generators, and many other compiler-related programs. LLVM + uses a single, language-independent virtual instruction set both + as an offline code representation (to communicate code between + compiler phases and to run-time systems) and as the compiler internal + representation (to analyze and transform programs). This persistent + code representation allows a common set of sophisticated compiler + techniques to be applied at compile-time, link-time, install-time, + run-time, or "idle-time" (between program runs). + . + Clang project is a new C, C++, Objective C and Objective C++ front-end + for the LLVM compiler. Some of its goals include the following: + . + End-User Features: + . + * Fast compiles and low memory use + * Expressive diagnostics (examples) + * GCC compatibility + . + Utility and Applications: + . + * Modular library based architecture + * Support diverse clients (refactoring, static analysis, code + generation, etc) + * Allow tight integration with IDEs + * Use the LLVM 'BSD' License + . + Internal Design and Implementation: + . + * A real-world, production quality compiler + * A simple and hackable code base + * A single unified parser for C, Objective C, C++, and Objective C++ + * Conformance with C/C++/ObjC and their variants + --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-doc.dirs +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-doc --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-examples.dirs +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-examples.dirs @@ -0,0 +1 @@ +usr/share/doc/llvm-examples --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-snapshot.install +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-snapshot.install @@ -0,0 +1,13 @@ +debian/tmp/@PF@/bin/* @PF@/bin/ +debian/tmp/@PF@/lib/* @PF@/lib/ +debian/tmp/@PF@/include/* @PF@/include/ + +debian/tmp/@PF@/docs/llvm/html usr/share/doc/llvm-snapshot/ +debian/tmp/@PF@/docs/llvm/ps usr/share/doc/llvm-snapshot/ + +build-llvm/Makefile.common @PF@/build/ +build-llvm/Makefile.config @PF@/build/ +build-llvm/config.status @PF@/build/ +Makefile.rules @PF@/build/ +configure @PF@/build/ +autoconf/ @PF@/build/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-doc.install +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-doc.install @@ -0,0 +1,2 @@ +debian/tmp/@PF@/docs/llvm/html usr/share/doc/llvm-doc/ +debian/tmp/@PF@/docs/llvm/ps usr/share/doc/llvm-doc/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm.install +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm.install @@ -0,0 +1,3 @@ +debian/tmp/@PF@/bin/* @PF@/bin/ +debian/tmp/@PF@/share/man/man1/* usr/share/man/man1/ +debian/llvm.binfmt usr/share/binfmts/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/clang.links +++ llvm-2.7~svn20100409/debian/debhelper.in/clang.links @@ -0,0 +1,2 @@ +usr/share/man/man1/clang.1.gz usr/share/man/man1/llvm-clang.1.gz +@PF@/bin/clang @PF@/bin/llvm-clang --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-examples.examples +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-examples.examples @@ -0,0 +1 @@ +examples/* --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm.postinst +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm.postinst @@ -0,0 +1,9 @@ +#!/bin/sh -e + +if test "$1" = "configure"; then + if test -x /usr/sbin/update-binfmts; then + update-binfmts --import llvm.binfmt || true + fi +fi + +#DEBHELPER# --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-dev.dirs +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-dev.dirs @@ -0,0 +1,5 @@ +@PF@/lib +@PF@/build +usr/share/doc/llvm-dev +usr/share/vim/vimcurrent/syntax +usr/share/emacs/site-lisp/llvm --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm.prerm +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm.prerm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +if test "$1" = "remove"; then + if test -x /usr/sbin/update-binfmts; then + update-binfmts --package llvm \ + --remove llvm /usr/bin/lli || true + fi +fi + +#DEBHELPER# + --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm.links +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm.links @@ -0,0 +1 @@ +# AUTOGENERATED in debian/rules.d/build.mk. --- llvm-2.7~svn20100409.orig/debian/debhelper.in/libllvm2.7.install +++ llvm-2.7~svn20100409/debian/debhelper.in/libllvm2.7.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/llvm/lib/libLLVM*.so.1 /usr/lib/llvm/lib/ +debian/tmp/usr/lib/libLLVM*.so.1 /usr/lib/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm.dirs +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm.dirs @@ -0,0 +1,6 @@ +@PF@/bin +usr/bin +usr/include +usr/share/man/man1 +etc/llvm +usr/share/binfmts --- llvm-2.7~svn20100409.orig/debian/debhelper.in/clang.install +++ llvm-2.7~svn20100409/debian/debhelper.in/clang.install @@ -0,0 +1,5 @@ +debian/tmp/@PF@/lib/clang @PF@/lib/ +debian/tmp/@PF@/bin/clang @PF@/bin/ +tools/clang/utils/scan-build @PF@/bin/ +tools/clang/utils/ccc-analyzer @PF@/bin/ +debian/tmp/@PF@/share/man/man1/clang.1 usr/share/man/man1/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-dev.install +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-dev.install @@ -0,0 +1,18 @@ +debian/tmp/@PF@/lib/* @PF@/lib/ +debian/tmp/usr/lib/*.so @PF@/lib/ +debian/tmp/@PF@/include/* usr/include/ + +build-llvm/Makefile.common @PF@/build/ +build-llvm/Makefile.config @PF@/build/ +build-llvm/config.status @PF@/build/ +Makefile.rules @PF@/build/ +configure @PF@/build/ + +utils/vim/llvm.vim usr/share/vim/vimcurrent/syntax +utils/vim/tablegen.vim usr/share/vim/vimcurrent/syntax + +utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm/ +utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm/ +utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm/ + +autoconf/ @PF@/build/ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-examples.links +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-examples.links @@ -0,0 +1,3 @@ +@PF@/build/Makefile.common usr/share/doc/llvm-examples/Makefile.common +@PF@/build/Makefile.config usr/share/doc/llvm-examples/Makefile.config +@PF@/build/Makefile.rules usr/share/doc/llvm-examples/Makefile.rules --- llvm-2.7~svn20100409.orig/debian/debhelper.in/libllvm2.7.shlibs +++ llvm-2.7~svn20100409/debian/debhelper.in/libllvm2.7.shlibs @@ -0,0 +1 @@ +@SHLIB_NAME@ 1 libllvm@PKG_VERSION@ --- llvm-2.7~svn20100409.orig/debian/debhelper.in/llvm-gcc-4.2.install +++ llvm-2.7~svn20100409/debian/debhelper.in/llvm-gcc-4.2.install @@ -0,0 +1 @@ +debian/tmp/@PF@