[arch-commits] Commit in emscripten/trunk (PKGBUILD gcc8.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, May 16, 2018 @ 07:56:18
  Author: svenstaro
Revision: 322573

upgpkg: emscripten 1.38.0-1

Added:
  emscripten/trunk/gcc8.patch
Modified:
  emscripten/trunk/PKGBUILD

------------+
 PKGBUILD   |   19 ++++++++++++-------
 gcc8.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-16 07:56:13 UTC (rev 322572)
+++ PKGBUILD	2018-05-16 07:56:18 UTC (rev 322573)
@@ -4,7 +4,7 @@
 # Contributor: Vlad Kolotvin <vlad.kolotvin at gmail.com>
 
 pkgname=emscripten
-pkgver=1.37.36
+pkgver=1.38.0
 pkgrel=1
 pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web"
 arch=('x86_64')
@@ -18,15 +18,19 @@
 source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz"
         emscripten-fastcomp-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp/archive/$pkgver.tar.gz"
         emscripten-fastcomp-clang-$pkgver.tar.gz::"https://github.com/kripken/emscripten-fastcomp-clang/archive/$pkgver.tar.gz"
-        "emscripten.sh")
-sha512sums=('55b39c7bc44ed3928d46563f835f76f9be87fbbdd461dd29d3e638128d3dac66aa1f111823151e9106f77fa34219c61b575eea2c27f49fa7e73c96a090ccb388'
-            '9a43274714834c809aae8cc96cba217b2c0e4e335b56cb651d27f5a68a41e2beeec4ce0ba1c4041de125a281b0241a0070fbb5a70db13e4f08943ab6fa295d87'
-            '1cbfbf594d59852a3cde236f81251e944fbb0f467ed6733881cd30ae72b25e0d7df60bd61ee76b5aed3bf6fe95d1d0058d3c18aa4d48e5533c20b0c986197ed9'
-            '52007717c21c22f5d9f027268de2516e969f2ffb8e37121f75ca2697b7ddcde6c0be9636d19df7b3c2e89bc769f5361750c62f9fcb84d224cde3c8626bc9c93b')
+        "emscripten.sh"
+        gcc8.patch)
+sha512sums=('5e28dd7f3b89c9404ca04f55b1a184e61629aeb25b46ad87700860efd472cc276b9741f22a9d48f034275369cfe7a01d6c3cd4765d6626aa9773e0dfa8542e38'
+            'e7860e3bba4b5c8c5312a2b1f5ee6d6d6a2e0afb35be2073efe7263dc217b95b1adb39675a01c9b6f89ec940736d68beac9d0173c1fd4a985b8e046fcaa1206f'
+            '85069ba90db1306ab960e2b3d04fc89516f8672672b872aa615f8f368dc34b922115e8fc44dc8fca9470c63c147b9faff888dda55d112c7c55a5f5850483ee63'
+            '52007717c21c22f5d9f027268de2516e969f2ffb8e37121f75ca2697b7ddcde6c0be9636d19df7b3c2e89bc769f5361750c62f9fcb84d224cde3c8626bc9c93b'
+            '8a651fc545bb09c23da6f138b1cc4f0d92758e7084460a09c6306ee7f727d52b0f780b775b6ef6118db144482cbfb37ef3d3dd662e357ceec0e713b342931365')
 
 prepare() {
   cd emscripten-fastcomp-$pkgver
 
+  patch -Np1 -i "$srcdir"/gcc8.patch
+
   # reset folder for out-of-source build
   rm -rf build
   mkdir build
@@ -48,7 +52,8 @@
 build() {
   cd emscripten-fastcomp-$pkgver/build
 
-  CC=gcc CXX=g++ cmake .. -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+  cmake .. \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=YES \
     -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" \

Added: gcc8.patch
===================================================================
--- gcc8.patch	                        (rev 0)
+++ gcc8.patch	2018-05-16 07:56:18 UTC (rev 322573)
@@ -0,0 +1,31 @@
+From 5cea35478aaaac7728a50cbafd3770f96162f7ac Mon Sep 17 00:00:00 2001
+From: Tilmann Scheller <tschelle at redhat.com>
+Date: Thu, 1 Feb 2018 11:40:01 -0600
+Subject: [PATCH] Fix return type in ORC readMem() client interface.
+
+GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang
+and earlier versions of GCC don't detect the issue.
+
+Fixes rhbz#1540620.
+---
+ include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+index da02250ba16..bed472e2e0e 100644
+--- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
++++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+@@ -713,8 +713,8 @@ private:
+ 
+   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
+ 
+-  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
+-                                      uint64_t Size) {
++  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
++                                         uint64_t Size) {
+     // Check for an 'out-of-band' error, e.g. from an MM destructor.
+     if (ExistingError)
+       return std::move(ExistingError);
+-- 
+2.16.1
+