mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-15 04:47:56 +00:00
New snapshot svn184294 release.
Improve some scripts and fix cpp11-migrate install from clang-tools-extra. Fix "versionless" clang manpages install. Fix Toolchain patch from change of scope (add namespaces).
This commit is contained in:
parent
598e56fc1e
commit
0b0ede35b1
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,3 +1,13 @@
|
|||||||
|
llvm-toolchain-snapshot (1:3.4~svn184294-1~exp1) experimental; urgency=low
|
||||||
|
|
||||||
|
* New snapshot release
|
||||||
|
* Improve some scripts and fix cpp11-migrate install from
|
||||||
|
clang-tools-extra.
|
||||||
|
* Fix "versionless" clang manpages install.
|
||||||
|
* Fix Toolchain patch from change of scope (add namespaces).
|
||||||
|
|
||||||
|
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 19 Jun 2013 14:20:12 +0200
|
||||||
|
|
||||||
llvm-toolchain-snapshot (1:3.4~svn184046-1~exp1) experimental; urgency=low
|
llvm-toolchain-snapshot (1:3.4~svn184046-1~exp1) experimental; urgency=low
|
||||||
|
|
||||||
* New snapshot release
|
* New snapshot release
|
||||||
|
2
debian/clang-3.4.manpages
vendored
2
debian/clang-3.4.manpages
vendored
@ -1,4 +1,4 @@
|
|||||||
build-llvm/tools/clang/docs/tools/clang-3.4.1
|
build-llvm/tools/clang/docs/tools/clang.1
|
||||||
clang/tools/scan-build/scan-build.1
|
clang/tools/scan-build/scan-build.1
|
||||||
debian/man/clang-check.1
|
debian/man/clang-check.1
|
||||||
|
|
||||||
|
8
debian/patches/30-kfreebsd.diff
vendored
8
debian/patches/30-kfreebsd.diff
vendored
@ -6,8 +6,8 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.h
|
|||||||
virtual bool isPICDefault() const;
|
virtual bool isPICDefault() const;
|
||||||
virtual bool isPIEDefault() const;
|
virtual bool isPIEDefault() const;
|
||||||
virtual bool isPICDefaultForced() const;
|
virtual bool isPICDefaultForced() const;
|
||||||
+ virtual void AddClangSystemIncludeArgs(const ArgList &DriverArgs,
|
+ virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
||||||
+ ArgStringList &CC1Args) const;
|
+ llvm::opt::ArgStringList &CC1Args) const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual Tool *getTool(Action::ActionClass AC) const;
|
virtual Tool *getTool(Action::ActionClass AC) const;
|
||||||
@ -19,8 +19,8 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.cpp
|
|||||||
return GoodVersion;
|
return GoodVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
+void Generic_GCC::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
|
+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
||||||
+ ArgStringList &CC1Args) const {
|
+ llvm::opt::ArgStringList &CC1Args) const {
|
||||||
+ // Under Debian, clang headers are installed into
|
+ // Under Debian, clang headers are installed into
|
||||||
+ // '/usr/include/clang/VERSION/include/'
|
+ // '/usr/include/clang/VERSION/include/'
|
||||||
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
|
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
|
||||||
|
8
debian/rules
vendored
8
debian/rules
vendored
@ -113,7 +113,8 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LL
|
|||||||
ln -s ../compiler-rt .; \
|
ln -s ../compiler-rt .; \
|
||||||
readlink compiler-rt
|
readlink compiler-rt
|
||||||
|
|
||||||
cp -R clang-tools-extra tools/clang/tools/extra
|
# Due to bug upstream, no symlink here
|
||||||
|
cp -R -H clang-tools-extra tools/clang/tools/extra
|
||||||
|
|
||||||
# Start the actual configure
|
# Start the actual configure
|
||||||
cd $(TARGET_BUILD) && $(PRE_CONFIGURE) \
|
cd $(TARGET_BUILD) && $(PRE_CONFIGURE) \
|
||||||
@ -176,11 +177,12 @@ override_dh_auto_install:
|
|||||||
d=$(CURDIR)/docs/_build/man/; \
|
d=$(CURDIR)/docs/_build/man/; \
|
||||||
cd $$d; \
|
cd $$d; \
|
||||||
for f in *.1; do \
|
for f in *.1; do \
|
||||||
echo "$$f"|grep "3\.3" || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
|
echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
|
||||||
done
|
done
|
||||||
|
|
||||||
# Rename some stuff with the version name
|
# Rename some stuff with the version name
|
||||||
mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1
|
# WILL DO when we can install several clang versions together
|
||||||
|
#mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1
|
||||||
|
|
||||||
if test -f $(CURDIR)/utils/vim/llvm.vim; then \
|
if test -f $(CURDIR)/utils/vim/llvm.vim; then \
|
||||||
mv $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim; \
|
mv $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim; \
|
||||||
|
Loading…
Reference in New Issue
Block a user