[arch-commits] Commit in emscripten/trunk (PKGBUILD no-version-check.patch)
Date: Friday, August 7, 2020 @ 21:43:28
Author: svenstaro
Revision: 671783
upgpkg: emscripten 1.40.1-1
Modified:
emscripten/trunk/PKGBUILD
Deleted:
emscripten/trunk/no-version-check.patch
+
PKGBUILD | 21 +
no-version-check.patch | 13 -
2 files changed, 5 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-07 21:41:04 UTC (rev 671782)
+++ PKGBUILD2020-08-07 21:43:28 UTC (rev 671783)
@@ -11,12 +11,12 @@
#
https://chromium.googlesource.com/emscripten-releases/+/e7e39da9c81faecd9ecf44065cee864d76e4e34d/DEPS
# Replace that pre-filled SHA with the one from the release. Then search for
the "llvm_project_revision"
# variable. It has the llvm commit to use here.
-_llvm_commit=55fa315b0352b63454206600d6803fafacb42d5e
+_llvm_commit=9f21947a331203ee2579db87f1d1ec22a949e20a
# The compatible binaryen version can be found as the
EXPECTED_BINARYEN_VERSION variable in
#
https://github.com/emscripten-core/emscripten/blob/1.39.20/tools/shared.py#L44
but I'm not sure how we're
# going to use this information at this point.
-pkgver=1.39.20
-pkgrel=4
+pkgver=1.40.1
+pkgrel=1
pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable
JavaScript for the web"
arch=('x86_64')
url="http://emscripten.org;
@@ -30,23 +30,12 @@
source=("git+https://github.com/kripken/emscripten#tag=$pkgver;
git+https://github.com/llvm/llvm-project.git#commit=$_llvm_commit
"emscripten.sh"
-emscripten-config
-no-version-check.patch
-
https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/11713.patch)
+emscripten-config)
sha512sums=('SKIP'
'SKIP'
'a87cf5d4a5ac10a4f84ff02ea577d54b560929dc64457b874cd1cbd88311cf6c4dcfbf3242150f6e556f4ba6efd370a99b9f9065faf494f25d91fc012cd5aa58'
-
'8b5951493f69631045f44736917144b7679beb2bf087fca8a8ba887224cfc598fe8c76c5a4e7aa4a09fbb8f1b7b42556b68f4aa9e5b93fb130fd8bdab79053d9'
-
'39f0e2cb8ade1f0b046495e835cc423674910009f3b539ae4952e360785bbc41e46d2d7337f30c2ff70d0c0c172365b55efcb8bc07385f533687498308959e02'
-
'b2e0c162335c40ee84968ab8c5bae5083a96f18dcc6c4d4f50e4a7f312d075ad965f9afb0a9d2ca290068ed1ef5fe2599c681162690c645ca1f36f3af592a05f')
+
'8b5951493f69631045f44736917144b7679beb2bf087fca8a8ba887224cfc598fe8c76c5a4e7aa4a09fbb8f1b7b42556b68f4aa9e5b93fb130fd8bdab79053d9')
-prepare() {
- cd emscripten
-
- patch -Np1 --no-backup-if-mismatch -i "$srcdir"/11713.patch
- patch -Np1 --no-backup-if-mismatch -i "$srcdir"/no-version-check.patch
-}
-
build() {
cd llvm-project/llvm
Deleted: no-version-check.patch
===
--- no-version-check.patch 2020-08-07 21:41:04 UTC (rev 671782)
+++ no-version-check.patch 2020-08-07 21:43:28 UTC (rev 671783)
@@ -1,13 +0,0 @@
-diff --git a/tools/gen_struct_info.py b/tools/gen_struct_info.py
-index 404d576ac..fec750809 100755
a/tools/gen_struct_info.py
-+++ b/tools/gen_struct_info.py
-@@ -396,7 +396,7 @@ def inspect_code(headers, cpp_opts, structs, defines):
- # -Oz optimizes enough to avoid warnings on code size/num locals
- cmd = [shared.EMCC] + cpp_opts + ['-o', js_file[1], src_file[1],
- '-O0', '--js-opts', '0',
'--memory-init-file', '0',
--'-Werror', '-Wno-format',
-+'-Werror', '-Wno-format',
'-Wno-error=version-check',
- '-s', 'BOOTSTRAPPING_STRUCT_INFO=1',
- '-s', 'WARN_ON_UNDEFINED_SYMBOLS=0',
- '-s', 'STRICT=1',
[arch-commits] Commit in emscripten/trunk (PKGBUILD no-version-check.patch)
Date: Thursday, July 30, 2020 @ 00:20:02
Author: svenstaro
Revision: 665858
upgpkg: emscripten 1.39.20-3: Turn binaryen incompatibility into a warning
(FS#67432)
Added:
emscripten/trunk/no-version-check.patch
Modified:
emscripten/trunk/PKGBUILD
+
PKGBUILD |6 ++
no-version-check.patch | 13 +
2 files changed, 19 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-29 23:38:36 UTC (rev 665857)
+++ PKGBUILD2020-07-30 00:20:02 UTC (rev 665858)
@@ -12,6 +12,9 @@
# Replace that pre-filled SHA with the one from the release. Then search for
the "llvm_project_revision"
# variable. It has the llvm commit to use here.
_llvm_commit=55fa315b0352b63454206600d6803fafacb42d5e
+# The compatible binaryen version can be found as the
EXPECTED_BINARYEN_VERSION variable in
+#
https://github.com/emscripten-core/emscripten/blob/1.39.20/tools/shared.py#L44
but I'm not sure how we're
+# going to use this information at this point.
pkgver=1.39.20
pkgrel=3
pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable
JavaScript for the web"
@@ -28,11 +31,13 @@
git+https://github.com/llvm/llvm-project.git#commit=$_llvm_commit
"emscripten.sh"
emscripten-config
+no-version-check.patch
https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/11713.patch)
sha512sums=('SKIP'
'SKIP'
'a87cf5d4a5ac10a4f84ff02ea577d54b560929dc64457b874cd1cbd88311cf6c4dcfbf3242150f6e556f4ba6efd370a99b9f9065faf494f25d91fc012cd5aa58'
'8b5951493f69631045f44736917144b7679beb2bf087fca8a8ba887224cfc598fe8c76c5a4e7aa4a09fbb8f1b7b42556b68f4aa9e5b93fb130fd8bdab79053d9'
+
'39f0e2cb8ade1f0b046495e835cc423674910009f3b539ae4952e360785bbc41e46d2d7337f30c2ff70d0c0c172365b55efcb8bc07385f533687498308959e02'
'b2e0c162335c40ee84968ab8c5bae5083a96f18dcc6c4d4f50e4a7f312d075ad965f9afb0a9d2ca290068ed1ef5fe2599c681162690c645ca1f36f3af592a05f')
prepare() {
@@ -39,6 +44,7 @@
cd emscripten
patch -Np1 --no-backup-if-mismatch -i "$srcdir"/11713.patch
+ patch -Np1 --no-backup-if-mismatch -i "$srcdir"/no-version-check.patch
}
build() {
Added: no-version-check.patch
===
--- no-version-check.patch (rev 0)
+++ no-version-check.patch 2020-07-30 00:20:02 UTC (rev 665858)
@@ -0,0 +1,13 @@
+diff --git a/tools/gen_struct_info.py b/tools/gen_struct_info.py
+index 404d576ac..fec750809 100755
+--- a/tools/gen_struct_info.py
b/tools/gen_struct_info.py
+@@ -396,7 +396,7 @@ def inspect_code(headers, cpp_opts, structs, defines):
+ # -Oz optimizes enough to avoid warnings on code size/num locals
+ cmd = [shared.EMCC] + cpp_opts + ['-o', js_file[1], src_file[1],
+ '-O0', '--js-opts', '0',
'--memory-init-file', '0',
+-'-Werror', '-Wno-format',
++'-Werror', '-Wno-format',
'-Wno-error=version-check',
+ '-s', 'BOOTSTRAPPING_STRUCT_INFO=1',
+ '-s', 'WARN_ON_UNDEFINED_SYMBOLS=0',
+ '-s', 'STRICT=1',
