build libblocksruntime+libdispatch

4 files changed, 48 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06ae81d256ec..90ee166436a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libdispatch-git
 	pkgdesc = Comprehensive support for concurrent code execution on multicore hardware
-	pkgver = 2017.06.19.a.r0.g56f36b6
-	pkgrel = 2
+	pkgver = 2021.02.02.a.r0.g1c303fa
+	pkgrel = 1
 	url = https://apple.github.io/swift-corelibs-libdispatch/
 	arch = i686
 	arch = x86_64
@@ -12,17 +12,15 @@ pkgbase = libdispatch-git
 	license = Apache
 	makedepends = git
 	makedepends = clang
-	depends = libbsd
-	depends = libblocksruntime
+	makedepends = cmake
 	provides = libdispatch
-	provides = libdispatch-clang-git
 	conflicts = libdispatch
-	conflicts = libdispatch-clang-git
 	conflicts = swift
 	conflicts = swift-development
-	replaces = libdispatch-clang-git
-	source = libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch.git
-	md5sums = SKIP
+	source = libdispatch-git::git+https://github.com/apple/swift-corelibs-libdispatch.git
+	source = remove-werror.patch
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = libdispatch-git
 
diff --git a/.gitignore b/.gitignore
index ebc187ca5012..32026b110f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 /pkg/
 *.pkg.tar*
 *.src.tar*
-/libdispatch/
+/libdispatch-git/
diff --git a/PKGBUILD b/PKGBUILD
index a396b740f4b3..8c87c07cd5e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,49 @@
-# Maintainer: Omri Mor <omri50@gmail.com>
-pkgname=libdispatch-git
-pkgver=2017.06.19.a.r0.g56f36b6
-pkgrel=2
+# Maintainer: soloturn@gmail.com
+# Contributor: Adrian Perez de Castro <aperez@igalia.com>
+
+_basename=libdispatch
+pkgname="$_basename-git"
+pkgver=2021.02.02.a.r0.g1c303fa
+pkgrel=1
 pkgdesc="Comprehensive support for concurrent code execution on multicore hardware"
 arch=(i686 x86_64 arm armv6h armv7h aarch64)
 url="https://apple.github.io/swift-corelibs-libdispatch/"
-license=('Apache')
-depends=('libbsd' 'libblocksruntime')
-makedepends=('git' 'clang')
-provides=('libdispatch' 'libdispatch-clang-git')
-conflicts=('libdispatch' 'libdispatch-clang-git' 'swift' 'swift-development')
-replaces=('libdispatch-clang-git')
-source=('libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch.git')
-md5sums=('SKIP')
+license=(Apache)
+makedepends=(git clang cmake)
+provides=($_basename)
+conflicts=($_basename swift swift-development)
+source=(
+	"$pkgname::git+https://github.com/apple/swift-corelibs-libdispatch.git"
+	remove-werror.patch
+)
+sha512sums=(
+	'SKIP'
+	'SKIP'
+)
 
 pkgver() {
-	cd "$srcdir/libdispatch"
+	cd "$pkgname"
 	git describe --long | sed 's/^swift-DEVELOPMENT-SNAPSHOT-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "$srcdir/libdispatch"
+	cd "$pkgname"
+	patch -p0 < "${srcdir}/remove-werror.patch"
 }
 
 build() {
-	cd "$srcdir/libdispatch"
-	sh autogen.sh
-	./configure \
-		--prefix=/usr \
-		--disable-embedded-blocks-runtime \
-		OBJCFLAGS="$CFLAGS" \
-		OBJCXXFLAGS="$CXXFLAGS"
-	make
+	CC=clang CXX=clang++ cmake -S"${pkgname}" -Bbuild \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBlocksRuntime_INCLUDE_DIR=/usr/include \
+		-DBlocksRuntime_LIBRARIES=/usr/lib/libBlocksRuntime.so
+	cmake --build build -j $(nproc)
 }
 
 check() {
-	cd "$srcdir/libdispatch"
-	make -k -j1 check
+	cmake --build build --target test
 }
 
 package() {
-	cd "$srcdir/libdispatch"
-	make DESTDIR="$pkgdir/" install
+	DESTDIR="${pkgdir}" cmake --install build
 }
diff --git a/remove-werror.patch b/remove-werror.patch
new file mode 100644
index 000000000000..e50ba5ed9614
--- /dev/null
+++ b/remove-werror.patch
@@ -0,0 +1,10 @@
+--- cmake/modules/DispatchCompilerWarnings.cmake.orig	2020-05-12 13:13:59.619689872 +0300
++++ cmake/modules/DispatchCompilerWarnings.cmake	2020-05-12 13:13:35.216171428 +0300
+@@ -2,7 +2,6 @@
+ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+   # TODO: someone needs to provide the msvc equivalent warning flags
+ else()
+-  add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+