diff --git a/debian/changelog b/debian/changelog index a055f0af..d546855b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-snapshot (1:4.0~svn288822-1~exp1) experimental; urgency=medium + + * New snapshot release + * d/p/kfreebsd-support.diff removed (applied upstream) + * debian/orig-tar.sh: less verbose + + -- Sylvestre Ledru Tue, 06 Dec 2016 17:54:39 +0100 + llvm-toolchain-snapshot (1:4.0~svn286225-1) unstable; urgency=medium * New snapshot release diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 969df2c4..e2bd3b37 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -125,28 +125,28 @@ mkdir -p $SVN_ARCHIVES # LLVM LLVM_TARGET=$FULL_VERSION checkout_sources llvm $(get_svn_url llvm $BRANCH $TAG) $LLVM_TARGET "$BRANCH" $REVISION -tar jcvf $FULL_VERSION.orig.tar.bz2 $LLVM_TARGET +tar jcf $FULL_VERSION.orig.tar.bz2 $LLVM_TARGET rm -rf $LLVM_TARGET # Clang CLANG_TARGET=clang_$VERSION checkout_sources clang $(get_svn_url cfe $BRANCH $TAG) $CLANG_TARGET "$BRANCH" $REVISION -tar jcvf $FULL_VERSION.orig-clang.tar.bz2 $CLANG_TARGET +tar jcf $FULL_VERSION.orig-clang.tar.bz2 $CLANG_TARGET rm -rf $CLANG_TARGET # Clang extra CLANG_TARGET=clang-tools-extra_$VERSION checkout_sources clang-tools-extra $(get_svn_url clang-tools-extra $BRANCH $TAG) $CLANG_TARGET "$BRANCH" $REVISION -tar jcvf $FULL_VERSION.orig-clang-tools-extra.tar.bz2 $CLANG_TARGET +tar jcf $FULL_VERSION.orig-clang-tools-extra.tar.bz2 $CLANG_TARGET rm -rf $CLANG_TARGET # Compiler-rt COMPILER_RT_TARGET=compiler-rt_$VERSION checkout_sources compiler-rt $(get_svn_url compiler-rt $BRANCH $TAG) $COMPILER_RT_TARGET "$BRANCH" $REVISION #$SVN_CMD $(get_svn_url compiler-rt $BRANCH $TAG) $COMPILER_RT_TARGET -tar jcvf $FULL_VERSION.orig-compiler-rt.tar.bz2 $COMPILER_RT_TARGET +tar jcf $FULL_VERSION.orig-compiler-rt.tar.bz2 $COMPILER_RT_TARGET rm -rf $COMPILER_RT_TARGET # Polly @@ -154,7 +154,7 @@ POLLY_TARGET=polly_$VERSION checkout_sources polly $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET "$BRANCH" $REVISION #$SVN_CMD $(get_svn_url polly $BRANCH $TAG) $POLLY_TARGET rm -rf $POLLY_TARGET/www $POLLY_TARGET/autoconf/config.sub $POLLY_TARGET/autoconf/config.guess -tar jcvf $FULL_VERSION.orig-polly.tar.bz2 $POLLY_TARGET +tar jcf $FULL_VERSION.orig-polly.tar.bz2 $POLLY_TARGET rm -rf $POLLY_TARGET # LLD @@ -162,7 +162,7 @@ LLD_TARGET=lld_$VERSION checkout_sources lld $(get_svn_url lld $BRANCH $TAG) $LLD_TARGET "$BRANCH" $REVISION #$SVN_CMD $(get_svn_url lld $BRANCH $TAG) $LLD_TARGET rm -rf $LLD_TARGET/www/ -tar jcvf $FULL_VERSION.orig-lld.tar.bz2 $LLD_TARGET +tar jcf $FULL_VERSION.orig-lld.tar.bz2 $LLD_TARGET rm -rf $LLD_TARGET # LLDB @@ -170,7 +170,7 @@ LLDB_TARGET=lldb_$VERSION checkout_sources lldb $(get_svn_url lldb $BRANCH $TAG) $LLDB_TARGET "$BRANCH" $REVISION #$SVN_CMD $(get_svn_url lldb $BRANCH $TAG) $LLDB_TARGET rm -rf $LLDB_TARGET/www/ -tar jcvf $FULL_VERSION.orig-lldb.tar.bz2 $LLDB_TARGET +tar jcf $FULL_VERSION.orig-lldb.tar.bz2 $LLDB_TARGET rm -rf $LLDB_TARGET PATH_DEBIAN="$(pwd)/$(dirname $0)/../" diff --git a/debian/patches/kfreebsd-support.diff b/debian/patches/kfreebsd-support.diff deleted file mode 100644 index a3bca058..00000000 --- a/debian/patches/kfreebsd-support.diff +++ /dev/null @@ -1,91 +0,0 @@ ---- - compiler-rt/cmake/config-ix.cmake | 3 ++- - lldb/cmake/LLDBDependencies.cmake | 2 +- - lldb/scripts/Python/modules/CMakeLists.txt | 4 ++-- - lldb/scripts/utilsOsType.py | 7 ++++++- - tools/llvm-shlib/CMakeLists.txt | 2 +- - 5 files changed, 12 insertions(+), 6 deletions(-) - -Index: llvm-toolchain-snapshot_4.0~svn288822/compiler-rt/cmake/config-ix.cmake -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn288822.orig/compiler-rt/cmake/config-ix.cmake -+++ llvm-toolchain-snapshot_4.0~svn288822/compiler-rt/cmake/config-ix.cmake -@@ -440,7 +440,8 @@ list_replace(COMPILER_RT_SANITIZERS_TO_B - - if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND - (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR -- (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN)))) -+ (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))) -+ AND NOT (OS_NAME STREQUAL "kFreeBSD")) - set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE) - else() - set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE) -Index: llvm-toolchain-snapshot_4.0~svn288822/lldb/cmake/LLDBDependencies.cmake -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn288822.orig/lldb/cmake/LLDBDependencies.cmake -+++ llvm-toolchain-snapshot_4.0~svn288822/lldb/cmake/LLDBDependencies.cmake -@@ -162,7 +162,7 @@ if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB ) - endif() - - # On FreeBSD/NetBSD backtrace() is provided by libexecinfo, not libc. --if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD") -+if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD") AND NOT CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") - list(APPEND LLDB_SYSTEM_LIBS execinfo) - endif() - -Index: llvm-toolchain-snapshot_4.0~svn288822/lldb/scripts/Python/modules/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn288822.orig/lldb/scripts/Python/modules/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn288822/lldb/scripts/Python/modules/CMakeLists.txt -@@ -6,6 +6,6 @@ if (CXX_SUPPORTS_NO_MACRO_REDEFINED) - endif () - - # build the Python readline suppression module only on Linux --if (CMAKE_SYSTEM_NAME MATCHES "Linux") -+if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "GNU" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") - add_subdirectory(readline) - endif() -Index: llvm-toolchain-snapshot_4.0~svn288822/lldb/scripts/utilsOsType.py -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn288822.orig/lldb/scripts/utilsOsType.py -+++ llvm-toolchain-snapshot_4.0~svn288822/lldb/scripts/utilsOsType.py -@@ -36,6 +36,7 @@ if sys.version_info.major >= 3: - Linux = 3 - NetBSD = 4 - Windows = 5 -+ kFreeBSD = 6 - else: - class EnumOsType(object): - values = ["Unknown", -@@ -43,7 +44,9 @@ else: - "FreeBSD", - "Linux", - "NetBSD", -- "Windows"] -+ "Windows", -+ "kFreeBSD" -+ ] - - class __metaclass__(type): - #++---------------------------------------------------------------- -@@ -91,5 +94,7 @@ def determine_os_type(): - eOSType = EnumOsType.NetBSD - elif strOS == "win32": - eOSType = EnumOsType.Windows -+ elif strOS.startswith("gnukfreebsd"): -+ eOSType = EnumOsType.kFreeBSD - - return eOSType -Index: llvm-toolchain-snapshot_4.0~svn288822/tools/llvm-shlib/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_4.0~svn288822.orig/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_4.0~svn288822/tools/llvm-shlib/CMakeLists.txt -@@ -38,7 +38,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLV - set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME - - list(REMOVE_DUPLICATES LIB_NAMES) --if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf" -+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") # FIXME: It should be "GNU ld for elf" - # GNU ld doesn't resolve symbols in the version script. - set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) - elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") diff --git a/debian/patches/series b/debian/patches/series index 7185c7b9..caa03b01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,7 +34,6 @@ lldb-link-atomic-cmake.patch disable-source-interleave.diff silent-gold-utils.diff disable-llvm-symbolizer-test.diff -kfreebsd-support.diff #fix-lldb-server-build clang-tidy-run-bin.diff #bug-30342.diff