proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 09:50:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hardcode the version and update the prepare script

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-01-07 15:04:28 +00:00
parent bbdfe1239f
commit cdf913da75
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch vendored
View File

@ -12,38 +12,16 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report. This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_4.0~svn286225/CMakeLists.txt Index: llvm-toolchain-snapshot_4.0~svn291344/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_4.0~svn286225.orig/CMakeLists.txt --- llvm-toolchain-snapshot_4.0~svn291344.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_4.0~svn286225/CMakeLists.txt +++ llvm-toolchain-snapshot_4.0~svn291344/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -49,6 +49,10 @@ project(LLVM @@ -39,7 +39,7 @@
${cmake_3_0_LANGUAGES}
C CXX ASM)
+set(DEBIAN_VERSION_SUFFIX "" CACHE STRING "Versioned program suffix that is required to exec correct subtool.")
+
+add_definitions( -DDEBIAN_VERSION_SUFFIX=\"${DEBIAN_VERSION_SUFFIX}\")
+
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "No build type selected, default to Debug")
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (default Debug)" FORCE)
Index: llvm-toolchain-snapshot_4.0~svn286225/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn286225.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_4.0~svn286225/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -36,10 +36,14 @@
// Project includes
#include "ProcessGDBRemoteLog.h"
+#ifndef DEBIAN_VERSION_SUFFIX
+#define DEBIAN_VERSION_SUFFIX ""
+#endif
+
#if defined(__APPLE__) #if defined(__APPLE__)
#define DEBUGSERVER_BASENAME "debugserver" #define DEBUGSERVER_BASENAME "debugserver"
#else #else
-#define DEBUGSERVER_BASENAME "lldb-server" -#define DEBUGSERVER_BASENAME "lldb-server"
+# define DEBUGSERVER_BASENAME "lldb-server" DEBIAN_VERSION_SUFFIX +# define DEBUGSERVER_BASENAME "lldb-server-4.0"
#endif #endif
#if defined(HAVE_LIBCOMPRESSION) #if defined(HAVE_LIBCOMPRESSION)

2
debian/prepare-new-release.sh vendored
View File

@ -9,7 +9,7 @@ for F in $LIST; do
TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
svn mv $F $TARGET svn mv $F $TARGET
done done
LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links 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` LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links 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`
for F in $LIST; do for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F