aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-02-22 00:07:35 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2020-02-22 00:12:39 +0100
commitd241a2c607d162a18ff2d522220a37121a1460db (patch)
treeb6d1ce606c38cdbf2e636780f5ae521dddd2acf8
parentafd9ecdf23d26aaf846eb7fce132fbda98f82cf3 (diff)
downloadaports-d241a2c607d162a18ff2d522220a37121a1460db.tar.gz
aports-d241a2c607d162a18ff2d522220a37121a1460db.tar.bz2
aports-d241a2c607d162a18ff2d522220a37121a1460db.tar.xz
community/emscripten-fastcomp: fix build with None build type
-rw-r--r--community/emscripten-fastcomp/APKBUILD4
-rw-r--r--community/emscripten-fastcomp/none-build-type.patch15
2 files changed, 18 insertions, 1 deletions
diff --git a/community/emscripten-fastcomp/APKBUILD b/community/emscripten-fastcomp/APKBUILD
index 458c491d87..83ea3c5d4d 100644
--- a/community/emscripten-fastcomp/APKBUILD
+++ b/community/emscripten-fastcomp/APKBUILD
@@ -18,6 +18,7 @@ makedepends="cmake paxmark zlib-dev"
source="emscripten-fastcomp-$pkgver.tar.gz::https://github.com/emscripten-core/emscripten-fastcomp/archive/$pkgver.tar.gz
emscripten-fastcomp-clang-$pkgver.tar.gz::https://github.com/emscripten-core/emscripten-fastcomp-clang/archive/$pkgver.tar.gz
llvm-fix-build-with-musl-libc.patch
+ none-build-type.patch
"
options="!check" # some tests are broken, don't bother with it for now
@@ -79,4 +80,5 @@ package() {
sha512sums="574e5b4cf86f16ae455b1f399ecec414f4d791b1b3b49afcd21e967bad62efc572e9f4cd1d2bdce050214ab25e419149bdbfc89cc868ab1019d6ca24c245db63 emscripten-fastcomp-1.39.0.tar.gz
58422eabd5795d1f9a5806862e7e2ec4489542227765064fa2f7f0930a6b96b59185302ded976189666a4fb452450fbfb37a525b8c7a3d1cc33b7e39b9909dcf emscripten-fastcomp-clang-1.39.0.tar.gz
-f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch"
+f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch
+b0d692ae595ea72cf6950b7d152c83a301c2f24178ec800a5e9c365961c78067512d0cdedb129fa0e528217a63d861daf6b9e2105d0309f65d3936a779a79144 none-build-type.patch"
diff --git a/community/emscripten-fastcomp/none-build-type.patch b/community/emscripten-fastcomp/none-build-type.patch
new file mode 100644
index 0000000000..14f10b223f
--- /dev/null
+++ b/community/emscripten-fastcomp/none-build-type.patch
@@ -0,0 +1,15 @@
+The build system includes its one check for available CMake build types.
+This check is incorrect as it doesn't include the None build type.
+
+diff -upr emscripten-fastcomp-1.39.0.orig/CMakeLists.txt emscripten-fastcomp-1.39.0/CMakeLists.txt
+--- emscripten-fastcomp-1.39.0.orig/CMakeLists.txt 2020-02-22 00:06:01.828125245 +0100
++++ emscripten-fastcomp-1.39.0/CMakeLists.txt 2020-02-22 00:06:29.265827242 +0100
+@@ -267,7 +267,7 @@ endif()
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+
+ if (CMAKE_BUILD_TYPE AND
+- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
++ NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(NONE|DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+ message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ endif()
+