Commit dccba565 authored by Sylvestre Ledru's avatar Sylvestre Ledru

prepare packaging of version 8

parent cbfebb8f
......@@ -2,7 +2,7 @@ Organization of the repository
==============================
The debian package for each LLVM point release is maintained as a git branch.
For example, the 7 release lives at in the "7" branch.
For example, the 8 release lives at in the "8" branch.
The current snapshot release is maintained in the "snapshot" branch.
......@@ -50,24 +50,24 @@ Retrieving a specific branch or release candidate with orig-tar.sh
==================================================================
When using orig-tar.sh, if you need to retrieve a specific branch, you can pass
the branch name as the first argument. For example, to get the 7 release
the branch name as the first argument. For example, to get the 8 release
branch at
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_70
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_80
you should use,
$ sh 7/debian/orig-tar.sh release_70
$ sh snapshot/debian/orig-tar.sh release_80
To retrieve a specific release candidate, you can pass the branch name as the
first argument, and the tag rc number as the second argument. For example, to
get the 7.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_701/rc3
get the 8.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_801/rc3
you should use,
$ sh 7/debian/orig-tar.sh RELEASE_701 rc3 7.0.1
$ sh snapshot/debian/orig-tar.sh RELEASE_801 rc3 8.0.1
For a stable release, the syntax is:
$ sh 7/debian/orig-tar.sh RELEASE_700 final 7.0
$ sh snapshot/debian/orig-tar.sh RELEASE_800 final 8.0
Additional maintainer scripts
......
llvm-toolchain-snapshot (1:8~svn339515-1~exp1) experimental; urgency=medium
* New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 12 Aug 2018 14:17:36 +0200
llvm-toolchain-snapshot (1:8~svn336894-1~exp1) experimental; urgency=medium
* branching
......
This diff is collapsed.
......@@ -19,8 +19,8 @@ set -e
# sh 4.0/debian/orig-tar.sh RELEASE_40 rc1
SVN_BASE_URL=http://llvm.org/svn/llvm-project/
MAJOR_VERSION=7
CURRENT_VERSION=7 # Should be changed to 3.5.1 later
MAJOR_VERSION=8
CURRENT_VERSION=8 # 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/
......
......@@ -3,11 +3,11 @@
tools/llvm-shlib/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/libclang/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309319.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
@@ -84,7 +84,7 @@ else()
--- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/libclang/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/clang/tools/libclang/CMakeLists.txt
@@ -87,7 +87,7 @@ else()
set(output_name "clang")
endif()
......@@ -16,15 +16,16 @@ Index: llvm-toolchain-snapshot_6.0~svn309319/clang/tools/libclang/CMakeLists.txt
OUTPUT_NAME ${output_name}
${SOURCES}
DEPENDS clang-headers
Index: llvm-toolchain-snapshot_6.0~svn309319/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_6.0~svn309319.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_6.0~svn309319/tools/llvm-shlib/CMakeLists.txt
@@ -35,6 +35,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
endif()
--- llvm-toolchain-snapshot_8~svn339515.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/tools/llvm-shlib/CMakeLists.txt
@@ -41,6 +41,8 @@ if(LLVM_BUILD_LLVM_DYLIB)
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
+set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+ set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
# 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_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-analyzer
Index: llvm-toolchain-snapshot_8~svn339515/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
--- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_8~svn339515/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++-7'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-8'; }
$IsCXX = 1
}
......@@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_7.0~svn257.06/clang/tools/scan-build/libexec/ccc-
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-7'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-8'; }
$IsCXX = 0
}
......@@ -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-7',
+ parser.add_argument('-binary', default='clang-format-8',
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-7")
+ (or (executable-find "clang-format-8")
"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-7'
+binary = 'clang-format-8'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
Index: llvm-toolchain-snapshot_7.0~svn309541/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Index: llvm-toolchain-snapshot_8.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
--- llvm-toolchain-snapshot_8.0~svn309541.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_8.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-7',
+ default='clang-tidy-8',
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-7',
+ default='clang-apply-replacements-8',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '
......@@ -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-7'
+BASE_DIR = '/usr/share/clang/scan-view-8'
def url_is_up(url):
......
Index: llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
Index: llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
===================================================================
--- llvm-toolchain-snapshot_3.9~svn268880.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_3.9~svn268880/utils/TableGen/CodeEmitterGen.cpp
@@ -229,6 +229,9 @@ void CodeEmitterGen::run(raw_ostream &o)
--- llvm-toolchain-snapshot_8~svn339515.orig/utils/TableGen/CodeEmitterGen.cpp
+++ llvm-toolchain-snapshot_8~svn339515/utils/TableGen/CodeEmitterGen.cpp
@@ -239,6 +239,9 @@ void CodeEmitterGen::run(raw_ostream &o)
ArrayRef<const CodeGenInstruction*> NumberedInstructions =
Target.getInstructionsByEnumValue();
......
......@@ -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_7.0~svn293997/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Index: llvm-toolchain-snapshot_8.0~svn293998/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
--- llvm-toolchain-snapshot_8.0~svn293998.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_8.0~svn293998/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,6 +32,7 @@
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h"
......
......@@ -2,14 +2,16 @@
lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
Index: llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -443,7 +443,7 @@ def make_symlink_liblldb(
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-7.so"
+ strLibFileExtn = "-8.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(
......@@ -2,10 +2,10 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_7~svn337372.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
--- llvm-toolchain-snapshot_8~svn339515.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_8~svn339515/lldb/source/API/CMakeLists.txt
@@ -4,7 +4,12 @@ endif()
get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
......@@ -40,4 +40,4 @@ Index: llvm-toolchain-snapshot_7~svn337372/lldb/source/API/CMakeLists.txt
- )
endif()
if (LLDB_WRAP_PYTHON)
if (LLDB_BUILD_FRAMEWORK)
......@@ -9,7 +9,7 @@
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-7.so'
+ file = 'libclang-8.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-7/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-8/bin/clang");
}
if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" .
This diff is collapsed.
#!/bin/sh
ORIG_VERSION=6.0
TARGET_VERSION=7.0
ORIG_VERSION_2=6_0
TARGET_VERSION_2=7_0
ORIG_VERSION_3=60
TARGET_VERSION_3=70
ORIG_VERSION=7
TARGET_VERSION=8
ORIG_VERSION_2=7_0
TARGET_VERSION_2=8_0
ORIG_VERSION_3=70
TARGET_VERSION_3=80
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 debian/qualify-clang.sh debian/README`
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/fix-scan-view-path.diff debian/qualify-clang.sh debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff`
for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_3|$TARGET_VERSION_3|g" $F
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
......
......@@ -2,7 +2,7 @@
# Stop at the first error
set -e
VERSION=7
VERSION=8
if test ! -f /usr/bin/llvm-config-$VERSION; then
echo "Install llvm-$VERSION & llvm-$VERSION-dev"
......@@ -304,8 +304,8 @@ for SYSTEM in ""; do
done
echo "If the following fails, try setting an environment variable such as:"
echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/7/include"
echo "libobjc-7-dev should be also installed"
echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/8/include"
echo "libobjc-8-dev should be also installed"
echo "#include <objc/objc.h>" > foo.m
clang-$VERSION -c foo.m
......
......@@ -436,7 +436,7 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so
mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp
cp openmp/runtime/exports/common.dia.50.ompt.optional/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp
......@@ -563,10 +563,10 @@ endif
override_dh_makeshlibs:
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:7~svn298832-1~)" -- -c4
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:7~svn298832-1~)"
dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" -- -c4
dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:8~svn298832-1~)"
dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:8~svn298832-1~)"
dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:8~svn298832-1~)"
dh_makeshlibs --remaining-packages
override_dh_shlibdeps:
......@@ -585,10 +585,10 @@ override_dh_strip:
find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f
ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?)))
: # If we don't have the right version of debhelper, don't run the option
dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:7~svn327768-1~)'
dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)'
endif
# ifeq (${LLD_ENABLE},yes)
# dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(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