Skip to content

Instantly share code, notes, and snippets.

@gabyx
Created January 12, 2018 22:27
Show Gist options
  • Save gabyx/611e1c97e324fb6f6e1fa6b7beab6de5 to your computer and use it in GitHub Desktop.
Save gabyx/611e1c97e324fb6f6e1fa6b7beab6de5 to your computer and use it in GitHub Desktop.
From b3191a0b675823edc8ea6eef29b7e36dba1f646f Mon Sep 17 00:00:00 2001
From: Gabriel Nuetzi <gnuetzi@gmail.com>
Date: Thu, 11 Jan 2018 23:51:47 +0100
Subject: [PATCH 1/2] Revert "llvm: remove lldb patch"
This reverts commit 8f84c9238a9a5f8d85a08755c20eff9c8040a6b1.
---
Formula/llvm.rb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Formula/llvm.rb b/Formula/llvm.rb
index 4efa05e19..d41499547 100644
--- a/Formula/llvm.rb
+++ b/Formula/llvm.rb
@@ -186,6 +186,12 @@ class Llvm < Formula
end
(buildpath/"tools/lldb").install resource("lldb")
+ if build.stable?
+ resource("lldb-fix-build").stage do
+ system "patch", "-p1", "-i", Pathname.pwd/"324f93b5e30.patch", "-d", buildpath/"tools/lldb"
+ end
+ end
+
# Building lldb requires a code signing certificate.
# The instructions provided by llvm creates this certificate in the
# user's login keychain. Unfortunately, the login keychain is not in
--
2.15.1
From 0a18ff7c0cabc4b2af9b05dd7b28bc760f1533df Mon Sep 17 00:00:00 2001
From: JCount <JCount42@gmail.com>
Date: Sat, 9 Sep 2017 14:36:28 -0400
Subject: [PATCH 2/2] llvm: fix compilation of lldb option (#17876)
Fixes #17839
---
Formula/llvm.rb | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Formula/llvm.rb b/Formula/llvm.rb
index d41499547..75bd34dcc 100644
--- a/Formula/llvm.rb
+++ b/Formula/llvm.rb
@@ -61,6 +61,14 @@ class Llvm < Formula
sha256 "b7c1c9e67975ca219089a3a6a9c77c2d102cead2dc38264f2524aa3326da376a"
end
+ # Fixes "error: no type named 'pid_t' in the global namespace"
+ # https://github.com/Homebrew/homebrew-core/issues/17839
+ # Already fixed in upstream trunk
+ resource "lldb-fix-build" do
+ url "https://github.com/llvm-mirror/lldb/commit/324f93b5e30.patch?full_index=1"
+ sha256 "f23fc92c2d61bf6c8bc6865994a75264fafba6ae435e4d2f4cc8327004523fb1"
+ end
+
resource "openmp" do
url "https://releases.llvm.org/5.0.1/openmp-5.0.1.src.tar.xz"
sha256 "adb635cdd2f9f828351b1e13d892480c657fb12500e69c70e007bddf0fca2653"
--
2.15.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment