[arch-commits] Commit in emscripten/trunk (3 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Oct 9 23:33:58 UTC 2019
Date: Wednesday, October 9, 2019 @ 23:33:57
Author: svenstaro
Revision: 514395
upgpkg: emscripten 1.38.47-3
Put seds into patches and try to fix FS#63985
Added:
emscripten/trunk/arch-template.patch
emscripten/trunk/libcxxabi-include-libunwind.patch
Modified:
emscripten/trunk/PKGBUILD
-----------------------------------+
PKGBUILD | 15 ++++++++++-----
arch-template.patch | 25 +++++++++++++++++++++++++
libcxxabi-include-libunwind.patch | 12 ++++++++++++
3 files changed, 47 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-09 23:06:43 UTC (rev 514394)
+++ PKGBUILD 2019-10-09 23:33:57 UTC (rev 514395)
@@ -5,7 +5,7 @@
pkgname=emscripten
pkgver=1.38.47
-pkgrel=2
+pkgrel=3
pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web"
arch=('x86_64')
url="http://emscripten.org"
@@ -20,16 +20,19 @@
# https://chromium.googlesource.com/emscripten-releases/+/refs/heads/master/DEPS
source=(emscripten-$pkgver.tar.gz::"https://github.com/kripken/emscripten/archive/$pkgver.tar.gz"
git+https://github.com/llvm/llvm-project.git#commit=411f1885b655ea622fe124a87a6eadfd988d7a5e
- "emscripten.sh")
+ "emscripten.sh"
+ arch-template.patch
+ libcxxabi-include-libunwind.patch)
sha512sums=('3cc645f214e79f36fb25876dc98c24582ab907a410aede9c8bb2823ff58d46c11b3e05a9c522ee8c5fcaf6be5cf751d1c2d6cf9095600350b6d7693e49fa801d'
'SKIP'
- 'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d')
+ 'fbe9b95b8d18e7d0c6ec5fded6f11b72fbe4ddd0391e5704b281ba79c479f3563e82423b790ddf3f0554a23d659193ca898a81fe3db509f16c30c7188b790e4d'
+ '5bb7be8a14392b7b34e2d8e3b442dc6409fea48ea5fe3528e2a4a03d574c8848f88de2b258e5f091ad7886762f6622d460c956bc4c1ad37c0dde24c0bb5a4417'
+ '3456c61bc8cc022f58cf2ae1ebda53057adc4f05fcddd71a6a69b172ef47ce41f1ded4cb49c49c71a68e8436d974458a06566d618a7dcbad9ded42fa5713386c')
prepare() {
cd "$srcdir"/emscripten-$pkgver
- sed -i 's|EMSCRIPTEN_ROOT.*|EMSCRIPTEN_ROOT = "/usr/lib/emscripten"|g' tools/settings_template_readonly.py
- sed -i 's|LLVM_ROOT.*|LLVM_ROOT = "/usr/lib/emscripten-llvm"|g' tools/settings_template_readonly.py
+ patch -Np1 -i "$srcdir"/arch-template.patch
mkdir "$srcdir"/llvm-project/llvm/build
}
@@ -64,6 +67,8 @@
install -d "$pkgdir"/usr/lib/emscripten
cp -rup em* cmake site src system third_party tools "$pkgdir"/usr/lib/emscripten
+ patch -Np1 -i "$srcdir"/libcxxabi-include-libunwind.patch -d "$pkgdir"
+
# Remove clutter
rm "$pkgdir"/usr/lib/emscripten/*.bat
Added: arch-template.patch
===================================================================
--- arch-template.patch (rev 0)
+++ arch-template.patch 2019-10-09 23:33:57 UTC (rev 514395)
@@ -0,0 +1,25 @@
+diff --git a/tools/settings_template_readonly.py b/tools/settings_template_readonly.py
+index 68287b6e8..79197dc4f 100644
+--- a/tools/settings_template_readonly.py
++++ b/tools/settings_template_readonly.py
+@@ -12,9 +12,9 @@ import os
+
+ # This is used by external projects in order to find emscripten. It is not used
+ # by emscripten itself.
+-EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN', '{{{ EMSCRIPTEN_ROOT }}}')) # directory
++EMSCRIPTEN_ROOT = "/usr/lib/emscripten"
+
+-LLVM_ROOT = os.path.expanduser(os.getenv('LLVM', '{{{ LLVM_ROOT }}}')) # directory
++LLVM_ROOT = "/usr/lib/emscripten"
+ BINARYEN_ROOT = os.path.expanduser(os.getenv('BINARYEN', '')) # if not set, we will use it from ports
+
+ # Add this if you have manually built the JS optimizer executable (in
+@@ -43,7 +43,7 @@ JAVA = 'java' # executable
+ # All JS engines to use when running the automatic tests. Not all the engines in
+ # this list must exist (if they don't, they will be skipped in the test runner).
+ #
+-# JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
++JS_ENGINES = [NODE_JS] # add V8_ENGINE or SPIDERMONKEY_ENGINE if you have them installed too.
+ #
+ # WASMER = os.path.expanduser(os.path.join('~', '.wasmer', 'bin', 'wasmer'))
+ # WASMTIME = os.path.expanduser(os.path.join('~', 'wasmtime'))
Added: libcxxabi-include-libunwind.patch
===================================================================
--- libcxxabi-include-libunwind.patch (rev 0)
+++ libcxxabi-include-libunwind.patch 2019-10-09 23:33:57 UTC (rev 514395)
@@ -0,0 +1,12 @@
+--- 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']
++ includes = [
++ ['system', 'lib', 'libunwind', 'include'],
++ ]
+
+ def get_cflags(self):
+ cflags = super(libcxxabi, self).get_cflags()
More information about the arch-commits
mailing list