[Lldb-commits] [PATCH] D31823: Update LLDB Host to support IPv6 over TCP

[Kamil Rytarowski via Phabricator via lldb-commits]

krytarowski added a comment.

Fix from pkgsrc-wip to resurrect LLDB Standalone build in SVN r. 300654.

  From 3371648af049cb4b40427ef87dcafb4745f10e8d Mon Sep 17 00:00:00 2001
  From: Kamil Rytarowski <n54 at gmx.com>
  Date: Wed, 19 Apr 2017 06:17:30 +0200
  Subject: [PATCH] lldb-netbsd: Upgrade to 300654
  
  This code has FPR and DBR for NetBSD/amd64.
  
  Add local patches to resurrect standalone build
  
  Sponsored by <The NetBSD Foundation>
  ---
   lldb-netbsd/Makefile                                        |  2 +-
   lldb-netbsd/distinfo                                        |  3 +++
   .../patches/patch-cmake_modules_LLDBStandalone.cmake        | 13 +++++++++++++
   lldb-netbsd/patches/patch-source_Host_common_MainLoop.cpp   | 13 +++++++++++++
   lldb-netbsd/patches/patch-source_Host_common_TCPSocket.cpp  | 13 +++++++++++++
   5 files changed, 43 insertions(+), 1 deletion(-)
   create mode 100644 lldb-netbsd/patches/patch-cmake_modules_LLDBStandalone.cmake
   create mode 100644 lldb-netbsd/patches/patch-source_Host_common_MainLoop.cpp
   create mode 100644 lldb-netbsd/patches/patch-source_Host_common_TCPSocket.cpp
  
  diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
  index 6604b75afe..d92ba960cd 100644
  --- a/lldb-netbsd/Makefile
  +++ b/lldb-netbsd/Makefile
  @@ -5,7 +5,7 @@ CATEGORIES=	lang devel
   
   SVN_REPOSITORIES=	lldb
   SVN_REPO.lldb=		http://llvm.org/svn/llvm-project/lldb/trunk
  -SVN_REVISION.lldb=	299783
  +SVN_REVISION.lldb=	300654
   
   MAINTAINER=	pkgsrc-users at NetBSD.org
   HOMEPAGE=	http://lldb.org/
  diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
  index 9e296857d3..0a1ce52470 100644
  --- a/lldb-netbsd/distinfo
  +++ b/lldb-netbsd/distinfo
  @@ -12,6 +12,9 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
   SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
   RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
   Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
  +SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = c68c9fbe37d7f2d118febf2914b56b551eb5e696
  +SHA1 (patch-source_Host_common_MainLoop.cpp) = 66cb4d07a092caac4d271ca4a638406076b5bd81
  +SHA1 (patch-source_Host_common_TCPSocket.cpp) = e18a33e66c281cbc1353787752789faf609b21f0
   SHA1 (patch-source_Plugins_ObjectFile_ELF_ObjectFileELF.cpp) = cdc5861eedcc79d3484ba011f5be595b2afcbae2
   SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.cpp) = e8609042fb407f3507ac7cbe00494bbad5a2ca14
   SHA1 (patch-source_Plugins_Process_elf-core_ProcessElfCore.h) = 902ce5e0187aa2649986db08c79af7291b852727
  diff --git a/lldb-netbsd/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-netbsd/patches/patch-cmake_modules_LLDBStandalone.cmake
  new file mode 100644
  index 0000000000..4641527762
  --- /dev/null
  +++ b/lldb-netbsd/patches/patch-cmake_modules_LLDBStandalone.cmake
  @@ -0,0 +1,13 @@
  +$NetBSD$
  +
  +--- cmake/modules/LLDBStandalone.cmake.orig	2017-04-19 04:06:59.854088855 +0000
  ++++ cmake/modules/LLDBStandalone.cmake
  +@@ -4,6 +4,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
  +   project(lldb)
  +   cmake_minimum_required(VERSION 2.8.12.2)
  + 
  ++  include(CheckIncludeFile)
  ++
  +   if (POLICY CMP0022)
  +     cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
  +   endif()
  diff --git a/lldb-netbsd/patches/patch-source_Host_common_MainLoop.cpp b/lldb-netbsd/patches/patch-source_Host_common_MainLoop.cpp
  new file mode 100644
  index 0000000000..747b039d09
  --- /dev/null
  +++ b/lldb-netbsd/patches/patch-source_Host_common_MainLoop.cpp
  @@ -0,0 +1,13 @@
  +$NetBSD$
  +
  +--- source/Host/common/MainLoop.cpp.orig	2017-04-19 03:59:22.000000000 +0000
  ++++ source/Host/common/MainLoop.cpp
  +@@ -7,7 +7,7 @@
  + //
  + //===----------------------------------------------------------------------===//
  + 
  +-#include "llvm/Config/config.h"
  ++#include "llvm/Config/llvm-config.h"
  + 
  + #include "lldb/Host/MainLoop.h"
  + #include "lldb/Utility/Error.h"
  diff --git a/lldb-netbsd/patches/patch-source_Host_common_TCPSocket.cpp b/lldb-netbsd/patches/patch-source_Host_common_TCPSocket.cpp
  new file mode 100644
  index 0000000000..18f5930997
  --- /dev/null
  +++ b/lldb-netbsd/patches/patch-source_Host_common_TCPSocket.cpp
  @@ -0,0 +1,13 @@
  +$NetBSD$
  +
  +--- source/Host/common/TCPSocket.cpp.orig	2017-04-19 03:59:22.000000000 +0000
  ++++ source/Host/common/TCPSocket.cpp
  +@@ -17,7 +17,7 @@
  + #include "lldb/Host/MainLoop.h"
  + #include "lldb/Utility/Log.h"
  + 
  +-#include "llvm/Config/config.h"
  ++#include "llvm/Config/llvm-config.h"
  + #include "llvm/Support/raw_ostream.h"
  + 
  + #ifndef LLDB_DISABLE_POSIX
  -- 
  2.11.0

https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3371648af049cb4b40427ef87dcafb4745f10e8d


Repository:
  rL LLVM

https://reviews.llvm.org/D31823