fix clang path in binary

4 files changed, 95 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ea63914a0f7..07bdbcb266a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = scopes-hg
 	pkgdesc = Scopes is a retargetable programming language & infrastructure
-	pkgver = r1775+.c1e8ee6bd379+
+	pkgver = r1776+.ebedc1a48c95+
 	pkgrel = 1
 	url = https://scopes.rocks
 	arch = x86_64
@@ -17,10 +17,10 @@ pkgbase = scopes-hg
 	conflicts = scopes
 	source = hg+https://hg@bitbucket.org/duangle/scopes
 	source = SPIRV-Cross.tar.gz::https://github.com/KhronosGroup/SPIRV-Cross/archive/2019-04-26.tar.gz
-	source = system-wide-SPIRV-Tools.patch
+	source = system-paths.patch
 	md5sums = SKIP
 	md5sums = 844c06fc801d321e060fd761b56fc246
-	md5sums = cb97d62b263433cd5ee45cb3f3761a4d
+	md5sums = afc47bda64dff9f2ab463e493b49063c
 
 pkgname = scopes-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index 4bc68c08b24f..a2090aa64b19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Sol Bekic <s+aur at s-ol dot nu>
 
 _pkgname=scopes
-pkgname=$_pkgname-hg
-pkgver=r1775+.c1e8ee6bd379+
+pkgname=${_pkgname}-hg
+pkgver=r1776+.ebedc1a48c95+
 pkgrel=1
 pkgdesc="Scopes is a retargetable programming language & infrastructure"
 url="https://scopes.rocks"
@@ -15,32 +15,32 @@ provides=('scopes')
 
 source=('hg+https://hg@bitbucket.org/duangle/scopes'
         'SPIRV-Cross.tar.gz::https://github.com/KhronosGroup/SPIRV-Cross/archive/2019-04-26.tar.gz'
-        'system-wide-SPIRV-Tools.patch')
+        'system-paths.patch')
 md5sums=('SKIP'
          '844c06fc801d321e060fd761b56fc246'
-         'cb97d62b263433cd5ee45cb3f3761a4d')
+         'afc47bda64dff9f2ab463e493b49063c')
 
 prepare() {
-  rm -rf ${srcdir}/${_pkgname}/SPIRV-Cross
-  mv ${srcdir}/SPIRV-Cross-* ${srcdir}/${_pkgname}/SPIRV-Cross
-  patch ${srcdir}/${_pkgname}/genie.lua ${srcdir}/system-wide-SPIRV-Tools.patch
+  rm -rf "${srcdir}/${_pkgname}"/SPIRV-Cross
+  mv "${srcdir}"/SPIRV-Cross-* "${srcdir}/${_pkgname}"/SPIRV-Cross
+  patch -d "${srcdir}/${_pkgname}" -p1 <"${srcdir}"/system-paths.patch
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}
+  cd "${srcdir}/${_pkgname}"
   genie gmake
   make -C build config=release
 }
 
 package() {
-  mkdir -p ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/usr/lib
-  cp ${srcdir}/${_pkgname}/bin/scopes ${pkgdir}/usr/bin/
-  cp ${srcdir}/${_pkgname}/bin/libscopesrt.so ${pkgdir}/usr/lib/
-  cp -r ${srcdir}/${_pkgname}/lib/* ${pkgdir}/usr/lib/
+  mkdir -p "${pkgdir}"/usr/bin
+  mkdir -p "${pkgdir}"/usr/lib
+  cp "${srcdir}/${_pkgname}"/bin/scopes "${pkgdir}"/usr/bin/
+  cp "${srcdir}/${_pkgname}"/bin/libscopesrt.so "${pkgdir}"/usr/lib/
+  cp -r "${srcdir}/${_pkgname}"/lib/* "${pkgdir}"/usr/lib/
 }
 
 pkgver() {
-  cd ${srcdir}/${_pkgname}
+  cd "${srcdir}/${_pkgname}"
   printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
diff --git a/system-paths.patch b/system-paths.patch
new file mode 100644
index 000000000000..e1336937e788
--- /dev/null
+++ b/system-paths.patch
@@ -0,0 +1,78 @@
+diff -r c1e8ee6bd379 genie.lua
+--- a/genie.lua	Fri May 10 21:14:23 2019 +0200
++++ b/genie.lua	Sat May 11 15:21:26 2019 +0200
+@@ -88,6 +88,10 @@
+     .. " engine passes option objcarcopts coverage support lto coroutines"
+     .. " webassembly")
+ local LLVM_INCLUDEDIR = pkg_config(LLVM_CONFIG .. " --includedir")
++local CLANG_INCLUDEDIR = pkg_config(LLVM_CONFIG .. " --prefix")[1]
++  .. "/lib/clang/"
++  .. pkg_config(LLVM_CONFIG .. " --version")[1]
++  .. "/include"
+ 
+ if not os.is("windows") then
+     premake.gcc.cxx = CLANG_CXX
+@@ -203,7 +207,6 @@
+     includedirs {
+         "external/linenoise-ng/include",
+         "external",
+-        "SPIRV-Tools/include",
+         "include",
+         "."
+     }
+@@ -217,6 +220,7 @@
+     targetdir "bin"
+     defines {
+         "SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS",
++        "CLANG_INCLUDE_DIR=\"" .. CLANG_INCLUDEDIR .. "\"",
+         "SCOPESRT_IMPL"
+     }
+ 
+@@ -277,8 +281,8 @@
+             --"-Wl,--export-dynamic",
+             --"-rdynamic",
+ 
+-            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
+-            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
++            "-lSPIRV-Tools-opt",
++            "-lSPIRV-Tools"
+         }
+         linkoptions(LLVM_LDFLAGS)
+         linkoptions {
+@@ -368,8 +372,8 @@
+             "-Wl,--stack,8388608"
+         }
+         linkoptions {
+-            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
+-            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
++            "-lSPIRV-Tools-opt",
++            "-lSPIRV-Tools"
+         }
+         linkoptions(LLVM_LDFLAGS)
+         linkoptions {
+@@ -438,8 +442,8 @@
+         }
+ 
+         linkoptions {
+-            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
+-            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
++            "-lSPIRV-Tools-opt",
++            "-lSPIRV-Tools"
+         }
+ 
+         linkoptions(LLVM_LDFLAGS)
+diff -r c1e8ee6bd379 src/boot.cpp
+--- a/src/boot.cpp	Fri May 10 21:14:23 2019 +0200
++++ b/src/boot.cpp	Sat May 11 15:21:26 2019 +0200
+@@ -231,7 +231,11 @@
+         char *path_copy = strdup(scopes_compiler_path);

+         scopes_compiler_dir = format("%s/..", dirname(path_copy))->data;

+         free(path_copy);

++#ifdef CLANG_INCLUDE_DIR

++        scopes_clang_include_dir = CLANG_INCLUDE_DIR;

++#else

+         scopes_clang_include_dir = format("%s/lib/clang/include", scopes_compiler_dir)->data;

++#endif

+         scopes_include_dir = format("%s/include", scopes_compiler_dir)->data;

+     }

+ 

diff --git a/system-wide-SPIRV-Tools.patch b/system-wide-SPIRV-Tools.patch
deleted file mode 100644
index 71a529e177b9..000000000000
--- a/system-wide-SPIRV-Tools.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- genie.lua	2019-05-10 22:42:22.968066743 +0200
-+++ genie.lua	2019-05-10 22:43:56.023245116 +0200
-@@ -203,7 +203,6 @@
-     includedirs {
-         "external/linenoise-ng/include",
-         "external",
--        "SPIRV-Tools/include",
-         "include",
-         "."
-     }
-@@ -277,8 +276,8 @@
-             --"-Wl,--export-dynamic",
-             --"-rdynamic",
- 
--            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
--            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
-+            "-lSPIRV-Tools-opt",
-+            "-lSPIRV-Tools"
-         }
-         linkoptions(LLVM_LDFLAGS)
-         linkoptions {
-@@ -368,8 +367,8 @@
-             "-Wl,--stack,8388608"
-         }
-         linkoptions {
--            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
--            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
-+            "-lSPIRV-Tools-opt",
-+            "-lSPIRV-Tools"
-         }
-         linkoptions(LLVM_LDFLAGS)
-         linkoptions {
-@@ -438,8 +437,8 @@
-         }
- 
-         linkoptions {
--            THISDIR .. "/SPIRV-Tools/build/source/opt/libSPIRV-Tools-opt.a",
--            THISDIR .. "/SPIRV-Tools/build/source/libSPIRV-Tools.a"
-+            "-lSPIRV-Tools-opt",
-+            "-lSPIRV-Tools"
-         }
- 
-         linkoptions(LLVM_LDFLAGS)