Commit 228ad20a authored by Sylvestre Ledru's avatar Sylvestre Ledru

* Change the versioning from X.Y to X as upstream is using

X.Y.Z and X I am keeping the epoch because it would be too complex to manage with the various updates scenario * Two new symbols in libclang - clang_getFileContents - clang_isInvalidDeclaration * Fix the VCS-* tags
parent d50ff924
llvm-toolchain-snapshot (1:7~svn322673-1) unstable; urgency=medium
* Packages, binaries and libraries have been renamed.
Instead of the X.Y naming, we moved to X to match the
naming from upstream.
As example, clang version 7 is named clang-7 (was clang-6.0)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 17 Jan 2018 10:50:39 +0100
llvm-toolchain-snapshot (1:3.6~svn214630-1~exp1) experimental; urgency=medium
* clang is now co-instalable. Available on version 3.4, 3.5 and 3.6
......
llvm-toolchain-snapshot (1:7~svn322673-1) unstable; urgency=medium
* Change the versioning from X.Y to X as upstream is using
X.Y.Z and X
I am keeping the epoch because it would be too complex to manage
with the various updates scenario
* Two new symbols in libclang
- clang_getFileContents
- clang_isInvalidDeclaration
* Fix the VCS-* tags
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 03 Jan 2018 20:04:10 +0100
llvm-toolchain-snapshot (1:6.0~svn321385-1) unstable; urgency=medium
* Snapshot upload before rc1 (January)
......
This diff is collapsed.
......@@ -261,6 +261,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_getExpansionLocation@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_getFieldDeclBitWidth@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_getFile@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_getFileContents@@LLVM_@LLVM_VERSION@ 1:7~svn321385-1~
clang_getFileLocation@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_getFileName@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_getFileTime@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
......@@ -335,6 +336,7 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
clang_isFileMultipleIncludeGuarded@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_isFunctionTypeVariadic@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_isInvalid@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_isInvalidDeclaration@LLVM_@LLVM_VERSION@ 1:7~svn321385-1~
clang_isPODType@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_isPreprocessing@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
clang_isReference@LLVM_@LLVM_VERSION@ 1:5.0~svn298832-1~
......
......@@ -15,8 +15,8 @@ set -e
# sh 4.0/debian/orig-tar.sh RELEASE_40 rc1
SVN_BASE_URL=http://llvm.org/svn/llvm-project/
MAJOR_VERSION=6.0
CURRENT_VERSION=6.0 # Should be changed to 3.5.1 later
MAJOR_VERSION=7
CURRENT_VERSION=7 # Should be changed to 3.5.1 later
if test -n "$1"; then
# http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/
......
# Force the version of clang in the analyzer
# This was causing the static analyzer to fail silently if the clang & clang++ are
# not installed
Index: llvm-toolchain-snapshot_6.0~svn256.06/clang/tools/scan-build/libexec/ccc-analyzer
Index: llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-analyzer
===================================================================
--- llvm-toolchain-snapshot_6.0~svn256.06.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_6.0~svn256.06/clang/tools/scan-build/libexec/ccc-analyzer
--- llvm-toolchain-snapshot_7.0~svn257.06.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-analyzer
@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-6.0'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-7'; }
$IsCXX = 1
}
......@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_6.0~svn256.06/clang/tools/scan-build/libexec/ccc-
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-6.0'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-7'; }
$IsCXX = 0
}
......@@ -7,7 +7,7 @@ Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/Replacement
bool ReplacementHandling::findClangApplyReplacements(const char *Argv0) {
ErrorOr<std::string> CARPathOrErr =
- findProgramByName("clang-apply-replacements");
+ findProgramByName("clang-apply-replacements-6.0");
+ findProgramByName("clang-apply-replacements-7");
if (!CARPathOrErr)
return true;
......@@ -16,7 +16,7 @@ Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-modernize/Core/Replacement
std::string ClangModernizePath = fs::getMainExecutable(Argv0, &StaticSymbol);
SmallString<128> TestPath = path::parent_path(ClangModernizePath);
- path::append(TestPath, "clang-apply-replacements");
+ path::append(TestPath, "clang-apply-replacements-6.0");
+ path::append(TestPath, "clang-apply-replacements-7");
if (fs::can_execute(Twine(TestPath)))
CARPath = TestPath.str();
......@@ -29,7 +29,7 @@ Index: llvm-toolchain-3.7-3.7/clang-tools-extra/clang-tidy/tool/run-clang-tidy.p
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-6.0',
+ default='clang-apply-replacements-7',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '
......@@ -11,7 +11,7 @@
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
- parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='clang-format-6.0',
+ parser.add_argument('-binary', default='clang-format-7',
help='location of binary to use for clang-format')
args = parser.parse_args()
......@@ -22,7 +22,7 @@
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-6.0")
+ (or (executable-find "clang-format-7")
"clang-format")
"Location of the clang-format executable.
......@@ -33,7 +33,7 @@
# set g:clang_format_path to the path to clang-format if it is not on the path
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-6.0'
+binary = 'clang-format-7'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
Index: llvm-toolchain-snapshot_6.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Index: llvm-toolchain-snapshot_7.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_6.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
--- llvm-toolchain-snapshot_7.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_7.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -157,10 +157,10 @@ def main():
'clang-tidy and clang-apply-replacements in '
'$PATH.')
parser.add_argument('-clang-tidy-binary', metavar='PATH',
- default='clang-tidy',
+ default='clang-tidy-6.0',
+ default='clang-tidy-7',
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-6.0',
+ default='clang-apply-replacements-7',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '
......@@ -2,19 +2,19 @@
clang/lib/Driver/ToolChains.cpp | 2 ++
1 file changed, 2 insertions(+)
Index: llvm-toolchain-5.0-5.0~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp
Index: llvm-toolchain-snapshot_7~svn322673/clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- llvm-toolchain-5.0-5.0~+rc2.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-5.0-5.0~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -15,6 +15,7 @@
#include "Arch/SystemZ.h"
--- llvm-toolchain-snapshot_7~svn322673.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_7~svn322673/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -17,6 +17,7 @@
#include "CommonArgs.h"
#include "Linux.h"
#include "clang/Basic/VirtualFileSystem.h"
+#include "clang/Basic/Version.h"
#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
@@ -2368,6 +2369,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
@@ -2334,6 +2335,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
addLibStdCxxIncludePaths(DriverArgs, CC1Args);
break;
}
......
......@@ -6,7 +6,7 @@ Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
kMaxPortsToTry = 100
###
+BASE_DIR = '/usr/share/clang/scan-view-6.0'
+BASE_DIR = '/usr/share/clang/scan-view-7'
def url_is_up(url):
......
Index: llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_7~svn322673/cmake/modules/AddLLVM.cmake
@@ -83,7 +83,7 @@ function(add_llvm_symbol_exports target_
# FIXME: Don't write the "local:" line on OpenBSD.
# in the export file, also add a linker script to version LLVM symbols (form: LLVM_N.M)
add_custom_command(OUTPUT ${native_export_file}
- COMMAND echo "LLVM_${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} {" > ${native_export_file}
+ COMMAND echo "LLVM_${LLVM_VERSION_MAJOR} {" > ${native_export_file}
COMMAND grep -q "[[:alnum:]]" ${export_file} && echo " global:" >> ${native_export_file} || :
COMMAND sed -e "s/$/;/" -e "s/^/ /" < ${export_file} >> ${native_export_file}
COMMAND echo " local: *;" >> ${native_export_file}
@@ -486,7 +486,7 @@ function(llvm_add_library name)
PROPERTIES
# Since 4.0.0, the ABI version is indicated by the major version
SOVERSION ${LLVM_VERSION_MAJOR}
- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
+ VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX})
endif()
endif()
@@ -508,7 +508,7 @@ function(llvm_add_library name)
if(${output_name} STREQUAL "output_name-NOTFOUND")
set(output_name ${name})
endif()
- set(library_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX})
+ set(library_name ${output_name}-${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX})
set(api_name ${output_name}-${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
set_target_properties(${name} PROPERTIES OUTPUT_NAME ${library_name})
llvm_install_library_symlink(${api_name} ${library_name} SHARED
Index: llvm-toolchain-snapshot_7~svn322673/clang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/clang/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn322673/clang/CMakeLists.txt
@@ -418,10 +418,10 @@ endif()
# Clang version information
set(CLANG_EXECUTABLE_VERSION
- "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
+ "${CLANG_VERSION_MAJOR}" CACHE STRING
"Version number that will be placed into the clang executable, in the form XX.YY")
set(LIBCLANG_LIBRARY_VERSION
- "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
+ "${CLANG_VERSION_MAJOR}" CACHE STRING
"Version number that will be placed into the libclang library , in the form XX.YY")
mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)
Index: llvm-toolchain-snapshot_7~svn322673/tools/llvm-shlib/simple_version_script.map.in
===================================================================
--- llvm-toolchain-snapshot_7~svn322673.orig/tools/llvm-shlib/simple_version_script.map.in
+++ llvm-toolchain-snapshot_7~svn322673/tools/llvm-shlib/simple_version_script.map.in
@@ -1 +1 @@
-LLVM_@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@ { global: *; };
+LLVM_@LLVM_VERSION_MAJOR@ { global: *; };
......@@ -12,10 +12,10 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_6.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Index: llvm-toolchain-snapshot_7.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_6.0~svn293997.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_6.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
--- llvm-toolchain-snapshot_7.0~svn293997.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_7.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,6 +32,7 @@
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h"
......
......@@ -9,7 +9,7 @@
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-6.0.so"
+ strLibFileExtn = "-7.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(
......@@ -9,7 +9,7 @@
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-6.0.so'
+ file = 'libclang-7.so'
if Config.library_path:
file = Config.library_path + '/' + file
......@@ -9,7 +9,7 @@
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) {
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-6.0/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-7/bin/clang");
}
if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" .
......@@ -46,3 +46,4 @@ lldb-disable-swig-error.diff
silent-test-macho.diff
silent-llvm-isel-fuzzer.diff
test-keep-alive.diff
library-binary-filename.diff
This diff is collapsed.
#!/bin/sh
ORIG_VERSION=5.0
TARGET_VERSION=6.0
ORIG_VERSION=6.0
TARGET_VERSION=7.0
ORIG_VERSION_2=6_0
TARGET_VERSION_2=6_0
TARGET_VERSION_2=7_0
LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/clang-apply-replacements.diff debian/patches/fix-scan-view-path.diff`
for F in $LIST; do
......
......@@ -7,15 +7,15 @@ GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o
GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 )
GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
LLVM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).([0-9]+).*,\1.\2,p")
LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p")
LLVM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9]+).*,\1,p")
LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9.]+)(~|-)(.*),\1,p")
ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
LLVM_VERSION_FULL := $(LLVM_VERSION).0
LLVM_VERSION_FULL := $(LLVM_VERSION).0.0
endif
SONAME_EXT := 1
# Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1
DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p")
# Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1
DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: ([0-9.]+)(~|-)(.*),\3,p")
ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
endif
......@@ -478,13 +478,13 @@ endif
# Delete the target build directory to save some space on the build systems
# All the files have been installed in $(CURDIR)/debian/tmp/ already
rm -rf $(TARGET_BUILD)
# rm -rf $(TARGET_BUILD)
override_dh_makeshlibs:
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:6.0~svn298832-1~)"
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:6.0~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:6.0~svn298832-1~)"
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 7~svn298832-1~)"
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 7~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 7~svn298832-1~)"
dh_makeshlibs --remaining-packages
override_dh_shlibdeps:
......@@ -499,7 +499,7 @@ override_dh_installman:
override_dh_strip:
: # running out of diskspace on the buildds
find $(TARGET_BUILD) -name '*.o' -o -name '*.a' | xargs -r rm -f
find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbg-package=libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg
dh_strip -p libllvm$(LLVM_VERSION) --dbg-package=libllvm$(LLVM_VERSION)-dbg
dh_strip -p liblldb-$(LLVM_VERSION) --dbg-package=liblldb-$(LLVM_VERSION)-dbg
......
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