* Merge changes from the 3.3 branch (see 1:3.3-12)

* Install libclang.so.1 in /usr/lib/*/libclang-3.4.so.1
* Bring back /usr/lib/llvm-3.4/lib/libclang.so (libclang-3.4-dev) and
  /usr/lib/llvm-3.4/lib/libclang.so.1 (libclang1-3.4)
This commit is contained in:
Sylvestre Ledru 2013-10-29 16:58:44 +00:00
parent b8d20c9dc5
commit 9174639990
4 changed files with 8 additions and 6 deletions

8
debian/changelog vendored
View File

@ -2,7 +2,7 @@ llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
* New snapshot release * New snapshot release
- Fix the scan-build warning (Closes: #725332) - Fix the scan-build warning (Closes: #725332)
* Merge changes from the 3.3 branch (see 1:3.3-11) * Merge changes from the 3.3 branch (see 1:3.3-12)
* Add lldb-3.4-dev package * Add lldb-3.4-dev package
* Remove mipsel-ftbfs.diff (applied upstream) * Remove mipsel-ftbfs.diff (applied upstream)
* Add support of coverity checker (non-free and not packaged) * Add support of coverity checker (non-free and not packaged)
@ -14,9 +14,11 @@ llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
* The package wasn't cleaned correctly (Closes: #722155) * The package wasn't cleaned correctly (Closes: #722155)
* libtinfo-dev is now a dependency of llvm-3.4-dev (Closes: #727129) * libtinfo-dev is now a dependency of llvm-3.4-dev (Closes: #727129)
* Install libclang.so in /usr/lib/*/libclang-3.4.so * Install libclang.so in /usr/lib/*/libclang-3.4.so
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1 * Install libclang.so.1 in /usr/lib/*/libclang-3.4.so.1
* Also ship the python clang binding (python-clang-3.4) * Also ship the python clang binding (python-clang-3.4)
* Enable polly if the dependencies are OK (only Debian unstable for now) * Enable polly if the dependencies are OK (only Debian unstable for now)
* Bring back /usr/lib/llvm-3.4/lib/libclang.so (libclang-3.4-dev) and
/usr/lib/llvm-3.4/lib/libclang.so.1 (libclang1-3.4)
* Honor the option "nocheck" * Honor the option "nocheck"
* Disable the build of lldb under HURD * Disable the build of lldb under HURD
* Ship the lldb headers into lldb-X.Y-dev (Closes: #723743) * Ship the lldb headers into lldb-X.Y-dev (Closes: #723743)
@ -25,7 +27,7 @@ llvm-toolchain-snapshot (1:3.4~svn193603-1) unstable; urgency=low
* Update the build dependency from tcl8.5 to tcl (Closes: #725953) * Update the build dependency from tcl8.5 to tcl (Closes: #725953)
* Update of the clang descriptions (Closes: #727684) * Update of the clang descriptions (Closes: #727684)
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 20 Sep 2013 05:25:17 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Tue, 29 Oct 2013 17:56:18 +0100
llvm-toolchain-snapshot (1:3.4~svn190846-1) unstable; urgency=low llvm-toolchain-snapshot (1:3.4~svn190846-1) unstable; urgency=low

View File

@ -1,3 +1,3 @@
usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang-3.4.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang.so

View File

@ -1 +1 @@
usr/lib/llvm-3.4/lib/libclang.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.4.so.1 usr/lib/llvm-3.4/lib/libclang.so.1

2
debian/rules vendored
View File

@ -115,7 +115,7 @@ endif
debian/%: debian/%.in debian/%: debian/%.in
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@
override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang1-$(LLVM_VERSION).links debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).install debian/pollycc
echo "Using gcc: " echo "Using gcc: "
$(CC) -v $(CC) -v
mkdir -p $(TARGET_BUILD) mkdir -p $(TARGET_BUILD)