mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-12 09:53:57 +00:00
* New snapshot release
TODO CVE * Merge with 3.4 * Remove scan-build-fix-clang-detection.diff (applied upstream) * Improve the CVE-2014-2893 fix (Closes: #744817) * Add a check to avoid an error on arch where compiler-rt is not available * New upstream release * Add build conflict on libllvm-3.5-ocaml-dev * 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 * Fix the soname of liblldb.so to see it treated as a real library (Closes: #750868) * Switch to the default gcc/g++ compiler. Currently 4.9 (Closes: #751322) * Fixes CVE-2014-2893 (Closes: #744817) * Be less permissive when installing lldb. Remove duplication of the install of liblldb.so.1 * 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) * Fix path for arch without support of compiler-rt. Should fix most of the FTBFS * Fix the soname. No changes in the ABI, so, no need to update the soname (Closes: #747701) * New upstream release. Note that only LLVM & Clang had a new release. I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and compiler-rt. * Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts * Backport of a r201586 from upstream. scan-build was failing on some project like firefox build system. (Yeh, advantage to be the packager of a software that I use ;) ). See scan-build-fix-clang-detection.diff * Fix the version in the symbol list (libclang1-3.4.symbols) * Update the path regarding upstream changed (3.4 => 3.4.1) (Patch improved also by Martin Nowack) * Remove generated file libllvm3.4.install * Add gnustep & gnustep-devel as suggests of clang-3.4 * Add libc6-dev as an explicit dependency of clang-3.4 * Build with dh_install --fail-missing * Start to use /usr/bin/foo-X.Y. First step to have several clang versions installed together * Add some missing files: - lli-child-target - llvm-3.4-runtime - count - llvm-3.4-tools - html.tar.gz - llvm-3.4-doc - ocamldoc.tar.gz - llvm-3.4-doc - BugpointPasses.so - llvm-3.4-dev - liblldb* - lldb-3.4-dev - lldb-platform-3.4 - lldb-3.4 - clang-apply-replacements - clang-3.4 - clang-tidy - clang-3.4 - pp-trace - clang-3.4
This commit is contained in:
Sylvestre Ledru
commit
41c6ab8341
86
debian/changelog
vendored
86
debian/changelog
vendored
@ -1,8 +1,12 @@
|
||||
llvm-toolchain-snapshot (1:3.5~svn209039-3) unstable; urgency=medium
|
||||
llvm-toolchain-snapshot (1:3.5~svn211089-1) unstable; urgency=medium
|
||||
|
||||
* New snapshot release
|
||||
TODO CVE
|
||||
* Merge with 3.4
|
||||
* Ship lldb-mi in lldb
|
||||
* Remove scan-build-fix-clang-detection.diff (applied upstream)
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 19 May 2014 13:58:01 +0200
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 17 Jun 2014 09:49:31 +0200
|
||||
|
||||
llvm-toolchain-snapshot (1:3.5~svn209039-2) unstable; urgency=medium
|
||||
|
||||
@ -41,11 +45,87 @@ llvm-toolchain-snapshot (1:3.5~svn209039-1) unstable; urgency=medium
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 16 May 2014 23:23:50 +0200
|
||||
|
||||
llvm-toolchain-snapshot (1:3.5~svn201651-1) unstable; urgency=medium
|
||||
llvm-toolchain-3.4 (1:3.4.2-2) unstable; urgency=medium
|
||||
|
||||
* Improve the CVE-2014-2893 fix (Closes: #744817)
|
||||
* Add a check to avoid an error on arch where compiler-rt is not available
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 16 Jun 2014 23:00:47 +0200
|
||||
|
||||
llvm-toolchain-3.4 (1:3.4.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
* Add build conflict on libllvm-3.5-ocaml-dev
|
||||
* 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
|
||||
* Fix the soname of liblldb.so to see it treated as a real library
|
||||
(Closes: #750868)
|
||||
* Switch to the default gcc/g++ compiler. Currently 4.9 (Closes: #751322)
|
||||
* Fixes CVE-2014-2893 (Closes: #744817)
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Jun 2014 15:55:57 +0200
|
||||
|
||||
llvm-toolchain-3.4 (1:3.4.1-4) unstable; urgency=medium
|
||||
|
||||
* Be less permissive when installing lldb. Remove duplication of the install
|
||||
of liblldb.so.1
|
||||
* 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 <sylvestre@debian.org> Sun, 18 May 2014 20:18:19 +0200
|
||||
|
||||
llvm-toolchain-3.4 (1:3.4.1-3) unstable; urgency=medium
|
||||
|
||||
* Fix path for arch without support of compiler-rt. Should fix most of the
|
||||
FTBFS
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 16 May 2014 15:27:37 +0200
|
||||
|
||||
llvm-toolchain-3.4 (1:3.4.1-2) unstable; urgency=medium
|
||||
|
||||
* Fix the soname. No changes in the ABI, so, no need to update the soname
|
||||
(Closes: #747701)
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 11 May 2014 17:29:22 +0200
|
||||
|
||||
llvm-toolchain-3.4 (1:3.4.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release. Note that only LLVM & Clang had a new release.
|
||||
I just copied the 3.4 tarballs for clang-extra-tools, polly, lldb and
|
||||
compiler-rt.
|
||||
>>>>>>> .merge-right.r1206
|
||||
* Symlink for current build mode missing (Closes upstream #18836)
|
||||
* Add link usr/lib/llvm-3.4/ to usr/lib/llvm-3.4/build/Debug+Asserts
|
||||
* Backport of a r201586 from upstream. scan-build was failing on some project
|
||||
like firefox build system. (Yeh, advantage to be the packager of a software
|
||||
that I use ;) ). See scan-build-fix-clang-detection.diff
|
||||
* Fix the version in the symbol list (libclang1-3.4.symbols)
|
||||
* Update the path regarding upstream changed (3.4 => 3.4.1)
|
||||
(Patch improved also by Martin Nowack)
|
||||
* Remove generated file libllvm3.4.install
|
||||
* Add gnustep & gnustep-devel as suggests of clang-3.4
|
||||
* Add libc6-dev as an explicit dependency of clang-3.4
|
||||
* Build with dh_install --fail-missing
|
||||
* Start to use /usr/bin/foo-X.Y. First step to have several clang versions
|
||||
installed together
|
||||
* Add some missing files:
|
||||
- lli-child-target - llvm-3.4-runtime
|
||||
- count - llvm-3.4-tools
|
||||
- html.tar.gz - llvm-3.4-doc
|
||||
- ocamldoc.tar.gz - llvm-3.4-doc
|
||||
- BugpointPasses.so - llvm-3.4-dev
|
||||
- liblldb* - lldb-3.4-dev
|
||||
- lldb-platform-3.4 - lldb-3.4
|
||||
- clang-apply-replacements - clang-3.4
|
||||
- clang-tidy - clang-3.4
|
||||
- pp-trace - clang-3.4
|
||||
|
||||
<<<<<<< .working
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 17 Feb 2014 13:55:34 +0100
|
||||
=======
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 09 May 2014 19:57:33 +0200
|
||||
>>>>>>> .merge-right.r1206
|
||||
|
||||
llvm-toolchain-snapshot (1:3.5~svn200375-1) unstable; urgency=medium
|
||||
|
||||
|
||||
8
debian/control
vendored
8
debian/control
vendored
@ -9,12 +9,12 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
|
||||
lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev,
|
||||
libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev,
|
||||
libisl-dev (>= 0.11.1), libjsoncpp-dev,
|
||||
lcov, procps, help2man, dh-ocaml, gcc-4.8, g++-4.8
|
||||
Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev
|
||||
lcov, procps, help2man, dh-ocaml, g++
|
||||
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/
|
||||
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.4/
|
||||
Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/
|
||||
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/
|
||||
|
||||
# ------------- clang -------------
|
||||
|
||||
|
||||
11
debian/libclang-common-3.5-dev.links
vendored
11
debian/libclang-common-3.5-dev.links
vendored
@ -1,4 +1,7 @@
|
||||
usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/include/clang/3.5/include
|
||||
usr/lib/llvm-3.5/lib/clang/3.5.0/include usr/lib/clang/3.5/include
|
||||
usr/lib/llvm-3.5/lib/clang/3.5.0/lib /usr/lib/clang/3.5/lib
|
||||
usr/lib/clang/3.5 usr/lib/clang/3.5.0
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/include usr/include/clang/3.4/include
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/include usr/lib/clang/3.4/include
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/lib usr/lib/clang/3.4/lib
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/include usr/include/clang/3.5.0/include
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/include usr/lib/clang/3.5.0/include
|
||||
usr/lib/llvm-3.4/lib/clang/3.5.0/lib usr/lib/clang/3.5.0/lib
|
||||
|
||||
|
||||
1
debian/libllvm3.5.install.in
vendored
1
debian/libllvm3.5.install.in
vendored
@ -1,2 +1 @@
|
||||
usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
|
||||
|
||||
|
||||
3
debian/libllvm3.5.links.in
vendored
3
debian/libllvm3.5.links.in
vendored
@ -1 +1,2 @@
|
||||
/usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.0.so.1
|
||||
usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1
|
||||
|
||||
|
||||
1
debian/lldb-3.5.links.in
vendored
1
debian/lldb-3.5.links.in
vendored
@ -1,4 +1,5 @@
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so usr/lib/python2.7/dist-packages/lldb/_lldb.so
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/liblldb.so.1 usr/lib/llvm-3.5/lib/liblldb.so.1
|
||||
|
||||
|
||||
1
debian/llvm-3.5-dev.install
vendored
1
debian/llvm-3.5-dev.install
vendored
@ -1,7 +1,6 @@
|
||||
usr/lib/llvm-3.5/lib/libLLVM*.a
|
||||
usr/lib/llvm-3.5/lib/libllvm*.a
|
||||
usr/lib/llvm-3.5/lib/LLVM*.so
|
||||
usr/lib/llvm-3.5/lib/libLLVM*.so
|
||||
usr/lib/llvm-3.5/lib/libLTO.*
|
||||
usr/lib/llvm-3.5/lib/BugpointPasses.so
|
||||
usr/lib/llvm-3.5/include/llvm/ usr/include/llvm-3.5/
|
||||
|
||||
3
debian/orig-tar.sh
vendored
3
debian/orig-tar.sh
vendored
@ -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
|
||||
|
||||
42
debian/patches/30-kfreebsd.diff
vendored
42
debian/patches/30-kfreebsd.diff
vendored
@ -1,39 +1,23 @@
|
||||
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h
|
||||
Index: llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.h 2013-11-17 23:36:07.000000000 +0100
|
||||
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.h 2013-12-05 09:07:45.000000000 +0100
|
||||
@@ -164,6 +164,8 @@
|
||||
virtual bool isPICDefault() const;
|
||||
virtual bool isPIEDefault() const;
|
||||
virtual bool isPICDefaultForced() const;
|
||||
+ virtual void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
||||
+ llvm::opt::ArgStringList &CC1Args) const;
|
||||
--- llvm-toolchain-3.4-3.4.1.orig/clang/lib/Driver/ToolChains.cpp 2014-04-26 01:38:13.000000000 +0200
|
||||
+++ llvm-toolchain-3.4-3.4.1/clang/lib/Driver/ToolChains.cpp 2014-05-10 12:34:16.374471699 +0200
|
||||
@@ -2588,6 +2588,10 @@
|
||||
if (DriverArgs.hasArg(options::OPT_nostdinc))
|
||||
return;
|
||||
|
||||
protected:
|
||||
virtual Tool *getTool(Action::ActionClass AC) const;
|
||||
Index: llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-3.4-3.4~+rc2.orig/clang/lib/Driver/ToolChains.cpp 2013-12-02 11:00:07.000000000 +0100
|
||||
+++ llvm-toolchain-3.4-3.4~+rc2/clang/lib/Driver/ToolChains.cpp 2013-12-05 09:08:49.000000000 +0100
|
||||
@@ -973,6 +973,13 @@
|
||||
return GoodVersion;
|
||||
}
|
||||
|
||||
+void Generic_GCC::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
||||
+ llvm::opt::ArgStringList &CC1Args) const {
|
||||
+ // Under Debian, clang headers are installed into
|
||||
+ // '/usr/include/clang/VERSION/include/'
|
||||
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
|
||||
+}
|
||||
+
|
||||
/// \brief Less-than for GCCVersion, implementing a Strict Weak Ordering.
|
||||
bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor,
|
||||
int RHSPatch,
|
||||
Index: llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp
|
||||
if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
|
||||
addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
|
||||
|
||||
Index: llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-3.4-3.4~+rc2.orig/lldb/source/Host/common/Host.cpp 2013-12-05 09:08:49.000000000 +0100
|
||||
+++ llvm-toolchain-3.4-3.4~+rc2/lldb/source/Host/common/Host.cpp 2013-12-05 09:09:17.294953434 +0100
|
||||
@@ -1546,7 +1546,7 @@
|
||||
--- llvm-toolchain-3.4-3.4.1.orig/lldb/source/Host/common/Host.cpp 2013-12-16 10:49:51.000000000 +0100
|
||||
+++ llvm-toolchain-3.4-3.4.1/lldb/source/Host/common/Host.cpp 2014-05-10 12:33:20.000000000 +0200
|
||||
@@ -1586,7 +1586,7 @@
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
36
debian/patches/gcc-4.9-support.diff
vendored
Normal file
36
debian/patches/gcc-4.9-support.diff
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Headers/stddef.h
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Headers/stddef.h (révision 201728)
|
||||
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Headers/stddef.h (révision 201729)
|
||||
@@ -84,6 +84,16 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
|
||||
+typedef struct {
|
||||
+ long long __clang_max_align_nonce1
|
||||
+ __attribute__((__aligned__(__alignof__(long long))));
|
||||
+ long double __clang_max_align_nonce2
|
||||
+ __attribute__((__aligned__(__alignof__(long double))));
|
||||
+} max_align_t;
|
||||
+#define __CLANG_MAX_ALIGN_T_DEFINED
|
||||
+#endif
|
||||
+
|
||||
#define offsetof(t, d) __builtin_offsetof(t, d)
|
||||
|
||||
#endif /* __STDDEF_H */
|
||||
Index: llvm-toolchain-snapshot_3.4~svn192346/clang/test/Headers/c11.c
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.4~svn192346/clang/test/Headers/c11.c (révision 201728)
|
||||
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/test/Headers/c11.c (révision 201729)
|
||||
@@ -22,6 +22,10 @@
|
||||
#define __STDC_WANT_LIB_EXT1__ 1
|
||||
#include <stddef.h>
|
||||
rsize_t x = 0;
|
||||
+_Static_assert(sizeof(max_align_t) >= sizeof(long long), "");
|
||||
+_Static_assert(alignof(max_align_t) >= alignof(long long), "");
|
||||
+_Static_assert(sizeof(max_align_t) >= sizeof(long double), "");
|
||||
+_Static_assert(alignof(max_align_t) >= alignof(long double), "");
|
||||
|
||||
// If we are freestanding, then also check RSIZE_MAX (in a hosted implementation
|
||||
// we will use the host stdint.h, which may not yet have C11 support).
|
||||
21
debian/patches/lldb-soname.diff
vendored
Normal file
21
debian/patches/lldb-soname.diff
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
Index: llvm-toolchain-snapshot_3.5~svn211089/lldb/lib/Makefile
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.5~svn211089.orig/lldb/lib/Makefile
|
||||
+++ llvm-toolchain-snapshot_3.5~svn211089/lldb/lib/Makefile
|
||||
@@ -16,6 +16,7 @@ LIBRARYNAME = lldb
|
||||
NO_BUILD_ARCHIVE = 1
|
||||
LINK_LIBS_IN_SHARED = 1
|
||||
SHARED_LIBRARY = 1
|
||||
+SONAME_EXTENSION = 1
|
||||
|
||||
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
|
||||
PYTHON_BUILD_FLAGS = $(shell python-config --ldflags)
|
||||
@@ -169,7 +170,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
|
||||
LLVMLibsOptions += -Wl,--no-undefined
|
||||
# Link in python
|
||||
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel
|
||||
- LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
|
||||
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION)
|
||||
ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
|
||||
# Link GCC atomic helper library
|
||||
LLVMLibsOptions += -latomic
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -36,4 +36,6 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff
|
||||
lldb-link-atomic.diff
|
||||
fix-llvm-config-obj-src-root.patch
|
||||
suffixsvn.diff
|
||||
scan-build-fix-clang-detection.diff
|
||||
compiler-rt-path.diff
|
||||
lldb-soname.diff
|
||||
|
||||
33
debian/rules
vendored
33
debian/rules
vendored
@ -2,8 +2,8 @@
|
||||
|
||||
TARGET_BUILD := build-llvm
|
||||
# Force the version of gcc to gcc 4.8. LLVM & co are now C++11 based.
|
||||
GCC_VERSION := 4.8
|
||||
#$(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p')
|
||||
#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.5
|
||||
LLVM_VERSION_FULL := $(LLVM_VERSION).0
|
||||
SONAME_EXT := 1
|
||||
@ -171,6 +171,8 @@ override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/libclang1
|
||||
cov-configure --compiler clang --comptype clang; \
|
||||
cov-configure --compiler gcc-4.8 --comptype gcc; \
|
||||
cov-configure --compiler g++-4.8 --comptype gcc; \
|
||||
cov-configure --compiler gcc-4.9 --comptype gcc; \
|
||||
cov-configure --compiler g++-4.9 --comptype gcc; \
|
||||
fi)
|
||||
|
||||
# Due to bug upstream, no symlink here
|
||||
@ -204,7 +206,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
|
||||
|
||||
@ -248,8 +250,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 \
|
||||
mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.$(SONAME_EXT); \
|
||||
@ -260,11 +262,13 @@ 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; \
|
||||
cp -f $(CURDIR)/$(TARGET_BUILD)/Release/lib/libLLVM-$(LLVM_VERSION)*.so* .; \
|
||||
rm -f libLLVM-$(LLVM_VERSION_FULL).so.1; \
|
||||
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)
|
||||
# Remove artefact (where compiler-rt is built)
|
||||
if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \
|
||||
cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux && rm -rf $$(find . -mindepth 2 -maxdepth 2 -type d) && rm -rf $$(find -empty) && rm -rf */.dir; \
|
||||
fi
|
||||
|
||||
mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/
|
||||
cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize
|
||||
@ -273,7 +277,7 @@ override_dh_auto_install:
|
||||
# under the unsupported archs of compiler-rt
|
||||
mkdir -p $(CURDIR)/debian/tmp/usr/lib/clang/$(LLVM_VERSION)/lib
|
||||
mkdir -p $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/lib/
|
||||
|
||||
mkdir -p $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/clang_linux/
|
||||
|
||||
# Rename binaries
|
||||
mkdir -p $(CURDIR)/debian/tmp/usr/bin/
|
||||
@ -305,6 +309,9 @@ override_dh_auto_install:
|
||||
override_dh_install:
|
||||
dh_install --fail-missing
|
||||
|
||||
override_dh_shlibdeps:
|
||||
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps
|
||||
|
||||
override_dh_installman:
|
||||
dh_installman
|
||||
# Make sure that lli manpage is only in llvm-3.2-runtime (See #697117)
|
||||
@ -318,9 +325,11 @@ 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
|
||||
|
||||
override_dh_installdeb:
|
||||
# Managed by the package
|
||||
@ -356,7 +365,7 @@ endif
|
||||
rm -f $(TARGET_BUILD)/Release/lib/libclang.so.1
|
||||
|
||||
# lldb tests
|
||||
ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf))
|
||||
ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel))
|
||||
if test $(LLDB_ENABLE) = yes; then \
|
||||
cd $(TARGET_BUILD)/Release/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \
|
||||
if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user