[arch-commits] Commit in emscripten/trunk (PKGBUILD libcxxabi-include-libunwind.patch)

[Sven-Hendrik Haase]

    Date: Monday, March 9, 2020 @ 11:04:38
  Author: svenstaro
Revision: 592960

upgpkg: emscripten 1.39.9-1

Modified:
  emscripten/trunk/PKGBUILD
  emscripten/trunk/libcxxabi-include-libunwind.patch

-----------------------------------+
 PKGBUILD                          |    9 ++++-----
 libcxxabi-include-libunwind.patch |   14 ++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-09 11:04:04 UTC (rev 592959)
+++ PKGBUILD	2020-03-09 11:04:38 UTC (rev 592960)
@@ -4,7 +4,7 @@
 # Contributor: Vlad Kolotvin <vlad.kolotvin at gmail.com>
 
 pkgname=emscripten
-pkgver=1.39.8
+pkgver=1.39.9
 pkgrel=1
 pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web"
 arch=('x86_64')
@@ -23,16 +23,17 @@
         "emscripten.sh"
         arch-template.patch
         libcxxabi-include-libunwind.patch)
-sha512sums=('359976a9a7c06ff674188ee2797242cc5e1db0bfd80ac5c91c652f3fe203f3fcbcbaea3f198942d10da202e00a2f2f8d885205b439a303970833871c4b8a3cd8'
+sha512sums=('f3639f0b95841a68a9b46ed166378aba807800e7b181e996cff7aee8485248dc128f380d090a5a81bb4d2372ee86b766c21926473d22b776ac50ef5bfc58fdda'
             'SKIP'
             'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d'
             '04ffe0eac346d4accd54321aace952ccf3d6016243b98e3239de3fddc77c2c89ac4dfd66f65095c7f8a474e0e2b692bbbf3a150fde1dc410de920d5835f332a1'
-            '3456c61bc8cc022f58cf2ae1ebda53057adc4f05fcddd71a6a69b172ef47ce41f1ded4cb49c49c71a68e8436d974458a06566d618a7dcbad9ded42fa5713386c')
+            'b124ff6110810e3190bf05deda478c6fef044ff55a435df978fdb7ff7b4f312186add48cb99946b67a2467f7e28855e36606209c3c4dcee2898762ccc2e4c2ed')
 
 prepare() {
   cd "$srcdir"/emscripten-$pkgver
 
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/arch-template.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch
 
   mkdir "$srcdir"/llvm-project/llvm/build
 }
@@ -67,8 +68,6 @@
   install -d "$pkgdir"/usr/lib/emscripten
   cp -rup em* cmake site src system third_party tools "$pkgdir"/usr/lib/emscripten
 
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch -d "$pkgdir"
-
   # Remove clutter
   rm "$pkgdir"/usr/lib/emscripten/*.bat
 

Modified: libcxxabi-include-libunwind.patch
===================================================================
--- libcxxabi-include-libunwind.patch	2020-03-09 11:04:04 UTC (rev 592959)
+++ libcxxabi-include-libunwind.patch	2020-03-09 11:04:38 UTC (rev 592960)
@@ -1,9 +1,11 @@
---- a/usr/lib/emscripten/tools/system_libs.py
-+++ b/usr/lib/emscripten/tools/system_libs.py
-@@ -758,6 +758,9 @@ class libcxxabi(CXXLibrary, NoExceptLibrary, MTLibrary):
-   name = 'libc++abi'
-   depends = ['libc']
-   cflags = ['-std=c++11', '-Oz', '-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS']
+diff --git a/tools/system_libs.py b/tools/system_libs.py
+index a1e616fa4..0b483d835 100755
+--- a/tools/system_libs.py
++++ b/tools/system_libs.py
+@@ -856,6 +856,9 @@ class libcxxabi(CXXLibrary, NoExceptLibrary, MTLibrary):
+       # revision: https://reviews.llvm.org/D64961
+       '-D_LIBCXXABI_GUARD_ABI_ARM',
+     ]
 +  includes = [
 +    ['system', 'lib', 'libunwind', 'include'],
 +  ]