diff --git a/debian/changelog b/debian/changelog index 8a08e511..e7857e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -llvm-toolchain-3.4 (1:3.4.1-5) unstable; urgency=medium +llvm-toolchain-3.4 (1:3.4.2-1) unstable; urgency=medium + * New upstream release + * Add build conflict on libllvm-3.5-ocaml-dev + * Remove the override of dh_shlibdeps * Also disable lldb tests under armel (like armhf). Timeout + * Update of the repack script + * Use llvm-3.4-dev.links.in to manage the symlinks - -- Sylvestre Ledru Wed, 04 Jun 2014 14:24:05 +0200 + -- Sylvestre Ledru Fri, 06 Jun 2014 15:55:57 +0200 llvm-toolchain-3.4 (1:3.4.1-4) unstable; urgency=medium @@ -11,7 +16,7 @@ llvm-toolchain-3.4 (1:3.4.1-4) unstable; urgency=medium * Add symlinks lldb-3.4, lldb-platform-3.4 & lldb-gdbserver-3.4 without 3.4 * Clang was unusable with libstdc++ from gcc 4.9 (Closes: #744792) - -- Sylvestre Ledru Tue, 27 May 2014 15:17:48 +0200 + -- Sylvestre Ledru Sun, 18 May 2014 20:18:19 +0200 llvm-toolchain-3.4 (1:3.4.1-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 65cd84b3..8f667606 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libisl-dev (>= 0.11.1), libjsoncpp-dev, lcov, procps, help2man, dh-ocaml, gcc-4.8, g++-4.8, -Build-Conflicts: oprofile, ocaml +Build-Conflicts: oprofile, ocaml, libllvm-3.5-ocaml-dev Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.4/ diff --git a/debian/libclang-common-3.4-dev.install b/debian/libclang-common-3.4-dev.install index b8c18c0d..19cf0f19 100644 --- a/debian/libclang-common-3.4-dev.install +++ b/debian/libclang-common-3.4-dev.install @@ -1,7 +1,7 @@ -usr/lib/llvm-3.4/lib/clang/3.4.1/include +usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/llvm-3.4/include/polly/ -usr/lib/llvm-3.4/lib/clang/3.4.1/lib +usr/lib/llvm-3.4/lib/clang/3.4.2/lib #usr/lib/clang/3.4/lib /usr/lib/clang/3.4/ diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-3.4-dev.links index 7f0afa19..734b2393 100644 --- a/debian/libclang-common-3.4-dev.links +++ b/debian/libclang-common-3.4-dev.links @@ -1,6 +1,6 @@ -usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4/lib -usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/include/clang/3.4.1/include -usr/lib/llvm-3.4/lib/clang/3.4.1/include usr/lib/clang/3.4.1/include -usr/lib/llvm-3.4/lib/clang/3.4.1/lib usr/lib/clang/3.4.1/lib \ No newline at end of file +usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4/lib +usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/include/clang/3.4.2/include +usr/lib/llvm-3.4/lib/clang/3.4.2/include usr/lib/clang/3.4.2/include +usr/lib/llvm-3.4/lib/clang/3.4.2/lib usr/lib/clang/3.4.2/lib \ No newline at end of file diff --git a/debian/libllvm3.4.install.in b/debian/libllvm3.4.install.in index c8ea2be9..29368d96 100644 --- a/debian/libllvm3.4.install.in +++ b/debian/libllvm3.4.install.in @@ -1,2 +1 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-3.4/lib/libLLVM-3.4.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libllvm3.4.links.in b/debian/libllvm3.4.links.in index e09c799c..9a00059a 100644 --- a/debian/libllvm3.4.links.in +++ b/debian/libllvm3.4.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 +usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-3.4-dev.install index 17e9f329..f2d33cd2 100644 --- a/debian/llvm-3.4-dev.install +++ b/debian/llvm-3.4-dev.install @@ -1,7 +1,6 @@ usr/lib/llvm-3.4/lib/libLLVM*.a usr/lib/llvm-3.4/lib/libllvm*.a usr/lib/llvm-3.4/lib/LLVM*.so -usr/lib/llvm-3.4/lib/libLLVM*so usr/lib/llvm-3.4/lib/libLTO.* usr/lib/llvm-3.4/lib/BugpointPasses.so usr/lib/llvm-3.4/include/llvm/ usr/include/llvm-3.4/ diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in index 9e2652c9..caf6b87b 100644 --- a/debian/llvm-3.4-dev.links.in +++ b/debian/llvm-3.4-dev.links.in @@ -1,5 +1,7 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so -usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.1.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.1.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.2.so +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.2.so.1 usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/include/llvm-c usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 388c8c58..50684740 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -20,7 +20,6 @@ if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ # For example: sh 3.4/debian/orig-tar.sh release_34 BRANCH=$1 - RCRELEASE="true" fi if test -n "$1" -a -n "$2"; then @@ -76,7 +75,7 @@ if test -n "$RCRELEASE"; then FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION else VERSION=$MAJOR_VERSION"~svn"$REVISION - FULL_VERSION="llvm-toolchain-snapshot_"$VERSION + FULL_VERSION="llvm-toolchain-"$MAJOR_VERSION"_"$VERSION fi # LLVM diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index d0fc4812..ed34e82f 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,32 +1,13 @@ -Index: llvm-toolchain-3.4-3.4.1/tools/llvm-shlib/Makefile +Index: llvm-toolchain-3.4_3.4~svn209031/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-3.4-3.4.1.orig/tools/llvm-shlib/Makefile 2014-05-11 20:13:33.000000000 +0200 -+++ llvm-toolchain-3.4-3.4.1/tools/llvm-shlib/Makefile 2014-05-11 20:36:51.662821231 +0200 -@@ -10,6 +10,7 @@ - LEVEL := ../.. - - LIBRARYNAME = LLVM-$(LLVMVersion) -+LIBRARYNAME_SONAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) - LIBRARYALIASNAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX) - - NO_BUILD_ARCHIVE := 1 -@@ -47,6 +48,10 @@ - $(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS) - mv $(LibName.SO) $(LibName.SO).1 - ln -s $(notdir $(LibName.SO)).1 $(LibName.SO) -+ # Crappy workaround. I just need to fix Debian quickly -+ ln -s $(notdir $(LibName.SO)).1 $(SharedLibDir)/lib$(LIBRARYNAME_SONAME).so.1 -+ -+ - - ifeq ($(HOST_OS),Darwin) - # set dylib internal version number to llvmCore submission number -@@ -78,7 +83,7 @@ +--- llvm-toolchain-3.4_3.4~svn209031.orig/tools/llvm-shlib/Makefile ++++ llvm-toolchain-3.4_3.4~svn209031/tools/llvm-shlib/Makefile +@@ -78,7 +78,7 @@ endif ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) # Add soname to the library. - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) -Wl,-Bsymbolic-functions -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME_SONAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).1 -Wl,-Bsymbolic-functions endif ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) diff --git a/debian/patches/series b/debian/patches/series index 4a118cb6..b503ef00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,4 +38,3 @@ lldb-link-atomic.diff fix-llvm-config-obj-src-root.patch scan-build-fix-clang-detection.diff compiler-rt-path.diff -gcc-4.9-support.diff diff --git a/debian/rules b/debian/rules index 482a61c6..e45a9f69 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ TARGET_BUILD := build-llvm GCC_VERSION := 4.8 #GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') LLVM_VERSION := 3.4 -LLVM_VERSION_FULL := $(LLVM_VERSION).1 +LLVM_VERSION_FULL := $(LLVM_VERSION).2 SONAME_EXT := 1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p') ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) @@ -203,7 +203,7 @@ override_dh_auto_build: # We run the build with the Asserts, new directory, make a symlink to make # sure the rest still work cd $(TARGET_BUILD) \ - if test -d Release+Asserts -a ! -d Release; then \ + if test -d Release+Asserts -a ! -e Release; then \ ln -s Release+Asserts Release; \ fi @@ -247,7 +247,8 @@ override_dh_auto_install: chrpath -d $(TARGET_BUILD)/Release/bin/clang chrpath -d `find $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable` - mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION_FULL)*.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) +# Add the trailing soname + mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) if test $(LLDB_ENABLE) = yes; then \ @@ -259,9 +260,7 @@ override_dh_auto_install: mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ fi; \ - rm -f libLLVM-$(LLVM_VERSION).so; \ - ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so; \ - ln -s libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) + rm -f libLLVM-$(LLVM_VERSION_FULL).so; \ rm -f libclang.so # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty) @@ -318,8 +317,8 @@ override_dh_strip: dh_strip -a -override_dh_shlibdeps: - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps +#override_dh_shlibdeps: +# LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps override_dh_install: dh_install --fail-missing