diff --git a/community/cmark/APKBUILD b/community/cmark/APKBUILD
index 3adbc3b7eaa395cd6c7969faedb190dd26d85df3..4743c476118a9aa987bc70a7506d1040d18f61a2 100644
--- a/community/cmark/APKBUILD
+++ b/community/cmark/APKBUILD
@@ -1,8 +1,10 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer:
 pkgname=cmark
 pkgver=0.29.0
-pkgrel=0
+pkgrel=1
 pkgdesc="C reference implementation of CommonMark, a rationalized Markdown spec"
+options="!check" # 2 Tests are incompatible with python3.8+
 url="https://github.com/commonmark/cmark"
 arch="all"
 license="BSD-2-Clause"
@@ -11,31 +13,20 @@ subpackages="$pkgname-doc $pkgname-static $pkgname-dev lib$pkgname:libs"
 source="cmark-$pkgver.tar.gz::https://github.com/commonmark/cmark/archive/$pkgver.tar.gz"
 
 build() {
-	mkdir -p "$builddir"/build
-	cmake . -B build \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$CMAKE_CROSSOPTS .
 	make -C build
 }
 
-check() {
-	make -C build test
-}
-
 package() {
 	make -C build install DESTDIR="$pkgdir"
 }
 
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
 sha512sums="06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112  cmark-0.29.0.tar.gz"