From 511e3c5f2ea580b705e8d4b0f5c99314144de418 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 7 Jun 2018 21:49:56 +1000
Subject: [PATCH] llvm: fix header dir suffix for secondary arch

---
 sys-devel/llvm/llvm-5.0.0.recipe           |  2 +-
 sys-devel/llvm/patches/llvm-5.0.0.patchset | 31 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/sys-devel/llvm/llvm-5.0.0.recipe b/sys-devel/llvm/llvm-5.0.0.recipe
index 551cf8a3a..c8c81c4bd 100644
--- a/sys-devel/llvm/llvm-5.0.0.recipe
+++ b/sys-devel/llvm/llvm-5.0.0.recipe
@@ -31,7 +31,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://releases.llvm.org/${portVersion}/llvm-${portVersion}.src.tar.xz"
 SOURCE_URI_2="https://releases.llvm.org/${portVersion}/cfe-${portVersion}.src.tar.xz"
 SOURCE_URI_3="https://releases.llvm.org/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz"
diff --git a/sys-devel/llvm/patches/llvm-5.0.0.patchset b/sys-devel/llvm/patches/llvm-5.0.0.patchset
index 076e5d9e8..5e47c7ca5 100644
--- a/sys-devel/llvm/patches/llvm-5.0.0.patchset
+++ b/sys-devel/llvm/patches/llvm-5.0.0.patchset
@@ -1,4 +1,4 @@
-From 3825ccfacb0e6db06ac955d58bb9d20dc43b52a8 Mon Sep 17 00:00:00 2001
+From d154950caa2cc64b7166e9b2bc9dc4bd94ac3edc Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 20 Jan 2016 21:13:28 +0000
 Subject: llvm-config: use /develop/headers instead of /include
@@ -49,10 +49,10 @@ index 08b096a..739213c 100644
          LinkDyLib = false;
          LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
 -- 
-2.14.2
+2.16.4
 
 
-From 23ce807b3b13948116864f588a401c191b630b20 Mon Sep 17 00:00:00 2001
+From c5741a157b7056206bd6a0d03b89df336cf77431 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 16 Sep 2017 15:02:46 +0200
 Subject: Haiku doesn't expose whether a FS is local or remote.
@@ -73,5 +73,28 @@ index 45097eb..1790a0a 100644
    // statvfs::f_basetype contains a null-terminated FSType name of the mounted target
    StringRef fstype(Vfs.f_basetype);
 -- 
-2.14.2
+2.16.4
+
+
+From 162492e9b84f5815f56909aeb8960bf90bfa5d05 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 7 Jun 2018 21:43:47 +1000
+Subject: Fix header dir suffix
+
+
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 739213c..ab7b46c 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,7 +333,7 @@ int main(int argc, char **argv) {
+   } else {
+     ActivePrefix = CurrentExecPrefix;
+ #ifdef __HAIKU__
+-    ActiveIncludeDir = ActivePrefix + "/develop/headers";
++    ActiveIncludeDir = ActivePrefix + "/develop/headers" + LLVM_LIBDIR_SUFFIX;
+     ActiveLibDir = ActivePrefix + "/develop/lib" + LLVM_LIBDIR_SUFFIX;
+ #else
+     ActiveIncludeDir = ActivePrefix + "/include";
+-- 
+2.16.4