Commit dd8713ff authored by Sylvestre Ledru's avatar Sylvestre Ledru

* Cmake migration. Done by Andrew Wilkins. Many thanks to him

  - Update patches to set SONAME in CMake build
  - Create symlinks with ".links", don't install from build tree
  - Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.)
  - Remove llvm-X.Y-tools package, because it contained only
    internal tools that are not intended for distribution.
  - Remove autotools-specific artifacts from packages.
  - Remove "dummy" documentation artifacts from llvm-X.Y-docs
    package. Not built/installed by CMake, not useful.
  - Update control/rules to support CMake
  - Patch LLDB SWIG interfaces to workaround a bug in SWIG
    See https://llvm.org/bugs/show_bug.cgi?id=25468
  - add missing files to clang-format
  - Add patch to fix sanitizer lit invocation
  - removed LLVM-internal tools (lit, FileCheck, not, *-tblgen, etc.);
    not installed by CMake, not intended for distribution
  - removed llvm-X.Y-tools (contained only internal tools)
  - removed autotools-specific artifacts (configure, Makefile, etc.)
  - removed dummy documentation files
parent 6c1a9591
llvm-toolchain-snapshot (1:3.8~svn255217-1~exp2) experimental; urgency=medium
* Update the clang description for something more accurate (C++-11, 14, etc)
* Cmake migration. Done by Andrew Wilkins. Many thanks to him
- Update patches to set SONAME in CMake build
- Create symlinks with ".links", don't install from build tree
- Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.)
- Remove llvm-X.Y-tools package, because it contained only
internal tools that are not intended for distribution.
- Remove autotools-specific artifacts from packages.
- Remove "dummy" documentation artifacts from llvm-X.Y-docs
package. Not built/installed by CMake, not useful.
- Update control/rules to support CMake
- Patch LLDB SWIG interfaces to workaround a bug in SWIG
See https://llvm.org/bugs/show_bug.cgi?id=25468
- add missing files to clang-format
- Add patch to fix sanitizer lit invocation
- removed LLVM-internal tools (lit, FileCheck, not, *-tblgen, etc.);
not installed by CMake, not intended for distribution
- removed llvm-X.Y-tools (contained only internal tools)
- removed autotools-specific artifacts (configure, Makefile, etc.)
- removed dummy documentation files
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 16 Jan 2016 12:34:11 +0100
......
usr/lib/llvm-@LLVM_VERSION@/bin/clang
usr/lib/llvm-@LLVM_VERSION@/bin/clang++
usr/lib/llvm-@LLVM_VERSION@/bin/clang-check
usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen
usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test
usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements
usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
usr/lib/llvm-@LLVM_VERSION@/bin/clang-query
usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename
usr/lib/llvm-@LLVM_VERSION@/bin/sancov
usr/bin/c-index-test*
tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/
#usr/share/man/man1/clang.1 usr/share/man/man1/
......@@ -17,10 +13,7 @@ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/
usr/bin/clang-@LLVM_VERSION@
usr/bin/clang++-@LLVM_VERSION@
usr/bin/clang-check-@LLVM_VERSION@
usr/bin/clang-tblgen-@LLVM_VERSION@
usr/bin/c-index-test-@LLVM_VERSION@
usr/bin/clang-apply-replacements-@LLVM_VERSION@
usr/bin/pp-trace-@LLVM_VERSION@
usr/bin/clang-query-@LLVM_VERSION@
usr/bin/clang-rename-@LLVM_VERSION@
usr/bin/sancov-@LLVM_VERSION@
......
# I know but well...
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz
clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz
#build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1
clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
debian/man/clang-check-@LLVM_VERSION@.1
debian/man/clang-tblgen-@LLVM_VERSION@.1
debian/man/scan-view-@LLVM_VERSION@.1
debian/man/clang-apply-replacements-@LLVM_VERSION@.1
debian/man/pp-trace-@LLVM_VERSION@.1
clang/tools/clang-format/clang-format-@LLVM_VERSION@.py usr/share/vim/addons/syntax/
clang/tools/clang-format/clang-format-diff-@LLVM_VERSION@ /usr/bin/
clang/tools/clang-format/clang-format.el usr/share/emacs/site-lisp/clang-format-@LLVM_VERSION@/
usr/bin/clang-format-@LLVM_VERSION@
usr/bin/git-clang-format-@LLVM_VERSION@
usr/lib/llvm-@LLVM_VERSION@/bin/clang-format
usr/lib/llvm-@LLVM_VERSION@/bin/git-clang-format
usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-format-diff.py usr/share/clang/clang-format-@LLVM_VERSION@/
usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-format.py usr/share/clang/clang-format-@LLVM_VERSION@/
usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-format.el usr/share/emacs/site-lisp/clang-format-@LLVM_VERSION@/
usr/lib/llvm-@LLVM_VERSION@/share/clang/clang-format-sublime.py usr/share/clang/clang-format-@LLVM_VERSION@/
......@@ -4,8 +4,7 @@ Priority: optional
Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre@debian.org>
Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
autoconf, automake, perl, libtool, chrpath, texinfo,
sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9),
lsb-release, patchutils, diffstat, xz-utils, python-dev,
libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev,
libjsoncpp-dev,
......@@ -59,7 +58,7 @@ Description: Tool to format C/C++/Obj-C code
Package: clang-tidy-3.8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, python
Replaces: clang-modernize-3.8, clang-3.8 (<< 1:3.8~svn250696-1)
Breaks: clang-modernize-3.8, clang-3.8 (<< 1:3.8~svn250696-1)
Description: clang-based C++ linter tool
......@@ -289,26 +288,6 @@ Description: Modular compiler and toolchain technologies, libraries and headers
This package provides the libraries and headers to develop applications
using llvm.
Package: llvm-3.8-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
llvm-3.8-dev (= ${binary:Version})
Description: Modular compiler and toolchain technologies, tools
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 tools for testing.
Package: libllvm-3.8-ocaml-dev
Section: ocaml
Architecture: any
......@@ -404,6 +383,7 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hp
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: debug
Priority: extra
Description: Next generation, high-performance debugger, debugging libraries
LLDB is a next generation, high-performance debugger. It is built as a set of
reusable components which highly leverage existing libraries in the larger LLVM
......
usr/lib/llvm-@LLVM_VERSION@/include/clang
usr/lib/llvm-@LLVM_VERSION@/include/clang-c
usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/lib/
#usr/include/clang /usr/include/
#usr/include/clang-c /usr/include/
......
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
# as upstream
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
......@@ -7,6 +7,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_CXCursorSet_insert@Base 3.2
clang_CXIndex_getGlobalOptions@Base 3.2
clang_CXIndex_setGlobalOptions@Base 3.2
clang_CXXField_isMutable@Base 3.8
clang_CXXMethod_isConst@Base 3.4
clang_CXXMethod_isPureVirtual@Base 3.4
clang_CXXMethod_isStatic@Base 3.2
......@@ -30,6 +31,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_CompileCommands_getSize@Base 3.2
clang_Cursor_getArgument@Base 3.2
clang_Cursor_getBriefCommentText@Base 3.2
clang_Cursor_getCXXManglings@Base 3.8
clang_Cursor_getCommentRange@Base 3.2
clang_Cursor_getMangling@Base 3.6
clang_Cursor_getModule@Base 3.2
......@@ -145,6 +147,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_disposeOverriddenCursors@Base 3.2
clang_disposeSourceRangeList@Base 3.6
clang_disposeString@Base 3.2
clang_disposeStringSet@Base 3.8
clang_disposeTokens@Base 3.2
clang_disposeTranslationUnit@Base 3.2
clang_enableStackTraces@Base 3.2
......@@ -199,6 +202,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_getCursorSpelling@Base 3.2
clang_getCursorType@Base 3.2
clang_getCursorUSR@Base 3.2
clang_getCursorVisibility@Base 3.8
clang_getDeclObjCTypeEncoding@Base 3.2
clang_getDefinitionSpellingAndExtent@Base 3.2
clang_getDiagnostic@Base 3.2
......@@ -272,6 +276,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_indexLoc_getCXSourceLocation@Base 3.2
clang_indexLoc_getFileLocation@Base 3.2
clang_indexSourceFile@Base 3.2
clang_indexSourceFileFullArgv@Base 3.8
clang_indexTranslationUnit@Base 3.2
clang_index_getCXXClassDeclInfo@Base 3.2
clang_index_getClientContainer@Base 3.2
......@@ -304,6 +309,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_isVolatileQualifiedType@Base 3.2
clang_loadDiagnostics@Base 3.2
clang_parseTranslationUnit2@Base 3.6
clang_parseTranslationUnit2FullArgv@Base 3.8
clang_parseTranslationUnit@Base 3.2
clang_remap_dispose@Base 3.2
clang_remap_getFilenames@Base 3.2
......
usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
# Should be uncommented for @LLVM_VERSION@.1 and other
# usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so
......@@ -8,12 +8,6 @@ usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/
# Explicit debian/tmp since there are multiple declarations
debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/
build-llvm/Makefile.common /usr/lib/llvm-@LLVM_VERSION@/build/
build-llvm/Makefile.config /usr/lib/llvm-@LLVM_VERSION@/build/
build-llvm/config.status /usr/lib/llvm-@LLVM_VERSION@/build/
Makefile.rules /usr/lib/llvm-@LLVM_VERSION@/build/
configure /usr/lib/llvm-@LLVM_VERSION@/build/
autoconf/ /usr/lib/llvm-@LLVM_VERSION@/build/
utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/
......
docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/
usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz
usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css
usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html
#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html
usr/lib/llvm-@LLVM_VERSION@/bin/lli
usr/lib/llvm-@LLVM_VERSION@/bin/lli-child-target
usr/bin/lli-@LLVM_VERSION@
usr/bin/lli-child-target-@LLVM_VERSION@
debian/llvm-@LLVM_VERSION@-runtime.binfmt usr/share/binfmts/
......@@ -5,5 +5,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz
llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@LLVM_VERSION@.1.gz
......@@ -5,6 +5,5 @@ debian/man/llvm-mcmarkup-@LLVM_VERSION@.1
debian/man/llvm-objdump-@LLVM_VERSION@.1
debian/man/llvm-rtdyld-@LLVM_VERSION@.1
debian/man/llvm-size-@LLVM_VERSION@.1
debian/man/llvm-tblgen-@LLVM_VERSION@.1
debian/man/llvm-ranlib-@LLVM_VERSION@.1
Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.7~svn241915.orig/tools/llvm-shlib/Makefile
+++ llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile
@@ -67,7 +67,7 @@ endif
--- a/tools/llvm-shlib/Makefile
+++ b/tools/llvm-shlib/Makefile
@@ -67,7 +67,7 @@
ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
# Add soname to the library.
......@@ -11,3 +9,24 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile
endif
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
--- a/tools/llvm-shlib/CMakeLists.txt
+++ b/tools/llvm-shlib/CMakeLists.txt
@@ -39,6 +39,7 @@
endif()
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
+set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
list(REMOVE_DUPLICATES LIB_NAMES)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -82,7 +82,7 @@
set(output_name "clang")
endif()
-add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC}
+add_clang_library(libclang ${ENABLE_SHARED} ${ENABLE_STATIC} SONAME
OUTPUT_NAME ${output_name}
${SOURCES}
DEPENDS clang-headers
Index: llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp
Index: llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm-toolchain-snapshot_3.8~svn257050.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp
@@ -531,9 +531,9 @@ int main(int argc, char **argv) {
--- llvm-toolchain-3.8_3.8~+rc1.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp
@@ -498,9 +498,9 @@ int main(int argc, char **argv) {
} else if (Arg == "--shared-mode") {
PrintSharedMode = true;
} else if (Arg == "--obj-root") {
......@@ -11,6 +11,6 @@ Index: llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp
} else if (Arg == "--src-root") {
- OS << LLVM_SRC_ROOT << '\n';
+ OS << ActivePrefix << "/build/" << '\n';
} else if (Arg == "--link-shared") {
LinkMode = LinkModeDyLib;
} else if (Arg == "--link-static") {
} else {
usage();
}
Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.8~svn253186.orig/lldb/lib/Makefile
+++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
@@ -16,6 +16,7 @@ LIBRARYNAME = lldb
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -16,6 +16,7 @@
NO_BUILD_ARCHIVE = 1
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
......@@ -10,7 +8,7 @@ Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
PYTHON_CONFIG?= python-config
@@ -191,7 +192,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
@@ -191,7 +192,7 @@
LLVMLibsOptions += -Wl,--no-undefined
# Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
......@@ -19,3 +17,40 @@ Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe))
# Link GCC atomic helper library
LLVMLibsOptions += -latomic
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -6,7 +6,12 @@
# for liblldb to link against
include(${LLDB_PROJECT_ROOT}/cmake/LLDBDependencies.cmake)
-add_lldb_library(liblldb SHARED
+set(output_name lldb)
+if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+ set(output_name liblldb)
+endif()
+
+add_lldb_library(liblldb SHARED OUTPUT_NAME ${output_name} SONAME
SBAddress.cpp
SBAttachInfo.cpp
SBBlock.cpp
@@ -78,7 +83,7 @@
set_target_properties(liblldb
PROPERTIES
- VERSION ${LLDB_VERSION}
+ VERSION 1
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -105,11 +110,6 @@
if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif()
-else()
- set_target_properties(liblldb
- PROPERTIES
- OUTPUT_NAME lldb
- )
endif()
if (LLDB_WRAP_PYTHON)
Index: llvm-toolchain-snapshot_3.8~svn252405/lldb/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.8~svn252405.orig/lldb/Makefile
+++ llvm-toolchain-snapshot_3.8~svn252405/lldb/Makefile
@@ -91,7 +91,8 @@ ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT)
$(RecursiveTargets)::
$(Verb) if [ ! -f test/Makefile ]; then \
$(MKDIR) test; \
- $(CP) $(PROJ_SRC_DIR)/test/Makefile test/Makefile; \
+ $(CP) $(PROJ_SRC_DIR)/packages/Python/lldbsuite/test/Makefile test/Makefile; \
+ $(CP) $(PROJ_SRC_DIR)/packages/Python/lldbsuite/test/Makefile $(PROJ_SRC_DIR)/test/; \
fi
endif
......@@ -34,8 +34,8 @@ follow-parallel-var.diff
hurd-EIEIO-undef.diff
silent-MCJIIT-tests.diff
lldb-libname.diff
strip-svn.diff
compiler-rt-i586.diff
clang-analyzer-force-version.diff
fix-cmake-config-prefix.diff
lldb-test-makefile.diff
llvm25468-lldb-swig-format-security.diff
llvm26003-sanitizer-check-env.diff
This diff is collapsed.
......@@ -49,3 +49,36 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/test/Feature/load_module.ll
@junk = global i32 0
Index: llvm-toolchain-3.8_3.8~+rc1/clang/test/SemaCXX/warn-memsize-comparison.cpp
===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/clang/test/SemaCXX/warn-memsize-comparison.cpp
+++ llvm-toolchain-3.8_3.8~+rc1/clang/test/SemaCXX/warn-memsize-comparison.cpp
@@ -11,8 +11,6 @@ extern "C" int strncasecmp(const char *s
extern "C" char *strncpy(char *dst, const char *src, size_t n);
extern "C" char *strncat(char *dst, const char *src, size_t n);
extern "C" char *strndup(const char *src, size_t n);
-extern "C" size_t strlcpy(char *dst, const char *src, size_t size);
-extern "C" size_t strlcat(char *dst, const char *src, size_t size);
void f() {
char b1[80], b2[80];
@@ -70,18 +68,6 @@ void f() {
expected-note {{explicitly cast the argument}}
if (strndup(b1, sizeof(b1)) != 0) {}
- if (strlcpy(b1, b2, sizeof(b1) != 0)) {} // \
- expected-warning{{size argument in 'strlcpy' call is a comparison}} \
- expected-note {{did you mean to compare}} \
- expected-note {{explicitly cast the argument}}
- if (strlcpy(b1, b2, sizeof(b1)) != 0) {}
-
- if (strlcat(b1, b2, sizeof(b1) != 0)) {} // \
- expected-warning{{size argument in 'strlcat' call is a comparison}} \
- expected-note {{did you mean to compare}} \
- expected-note {{explicitly cast the argument}}
- if (strlcat(b1, b2, sizeof(b1)) != 0) {}
-
if (memset(b1, 0, sizeof(b1) / 2)) {}
if (memset(b1, 0, sizeof(b1) >> 2)) {}
if (memset(b1, 0, 4 << 2)) {}
Index: llvm-toolchain-snapshot_3.8~svn243851/autoconf/configure.ac
===================================================================
--- llvm-toolchain-snapshot_3.8~svn243851.orig/autoconf/configure.ac
+++ llvm-toolchain-snapshot_3.8~svn243851/autoconf/configure.ac
@@ -32,12 +32,12 @@ dnl===----------------------------------
dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs.
-AC_INIT([LLVM],[3.8.0svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.8.0],[http://llvm.org/bugs/])
LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=8
LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX=
AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
Index: llvm-toolchain-snapshot_3.8~svn243851/configure
===================================================================
--- llvm-toolchain-snapshot_3.8~svn243851.orig/configure
+++ llvm-toolchain-snapshot_3.8~svn243851/configure
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.8.0svn'
-PACKAGE_STRING='LLVM 3.8.0svn'
+PACKAGE_VERSION='3.8.0'
+PACKAGE_STRING='LLVM 3.8.0'
PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp"
@@ -1956,7 +1956,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=8
LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX=
cat >>confdefs.h <<_ACEOF
Index: llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile
Index: llvm-toolchain-3.8_3.8~+rc1/polly/lib/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.8~svn243372.orig/polly/lib/Makefile
+++ llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile
--- llvm-toolchain-3.8_3.8~+rc1.orig/polly/lib/Makefile
+++ llvm-toolchain-3.8_3.8~+rc1/polly/lib/Makefile
@@ -26,9 +26,9 @@ ISL_CODEGEN_FILES= CodeGen/IslAst.cpp \
CodeGen/IslNodeBuilder.cpp \
CodeGen/CodeGeneration.cpp
......@@ -15,10 +15,48 @@ Index: llvm-toolchain-snapshot_3.8~svn243372/polly/lib/Makefile
ISL_FILES= External/isl/basis_reduction_tab.c \
External/isl/isl_aff.c \
@@ -142,4 +142,5 @@ SOURCES= Polly.cpp \
@@ -146,4 +146,5 @@ SOURCES= Polly.cpp \
#
include $(LEVEL)/Makefile.common
-LIBS += $(POLLY_LD) $(POLLY_LIB)
+LIBS += $(POLLY_LD) $(POLLY_LIB) -ljsoncpp
+
Index: llvm-toolchain-3.8_3.8~+rc1/polly/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-3.8_3.8~+rc1.orig/polly/lib/CMakeLists.txt
+++ llvm-toolchain-3.8_3.8~+rc1/polly/lib/CMakeLists.txt
@@ -1,10 +1,10 @@
set(LLVM_NO_RTTI 1)
-set(POLLY_JSON_FILES
- JSON/json_reader.cpp
- JSON/json_value.cpp
- JSON/json_writer.cpp
-)
+# set(POLLY_JSON_FILES
+# JSON/json_reader.cpp
+# JSON/json_value.cpp
+# JSON/json_writer.cpp
+# )
set(ISL_CODEGEN_FILES
CodeGen/IslAst.cpp
@@ -46,7 +46,7 @@ add_polly_library(Polly
Support/RegisterPasses.cpp
Support/ScopHelper.cpp
Support/ScopLocation.cpp
- ${POLLY_JSON_FILES}
+# ${POLLY_JSON_FILES}
Transform/Canonicalization.cpp
Transform/CodePreparation.cpp
Transform/DeadCodeElimination.cpp
@@ -54,7 +54,7 @@ add_polly_library(Polly
${POLLY_HEADER_FILES}
)
-target_link_libraries(Polly PollyISL)
+target_link_libraries(Polly PollyISL jsoncpp)
if (BUILD_SHARED_LIBS)
target_link_libraries(Polly
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment