Fixed build issue related to missing rtsig.h

3 files changed, 13 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ef9d63be775..f2fc261fd9c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = darling-git
 	pkgdesc = A Darwin/OS X emulation layer for Linux
 	pkgver = r2301.6c63fdc8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.darlinghq.org
 	arch = x86_64
 	groups = darling-git
@@ -34,7 +34,7 @@ pkgbase = darling-git
 	source = git+https://github.com/darlinghq/darling.git
 	source = dkms.conf
 	md5sums = SKIP
-	md5sums = 2a499e6cc4a31323d82a56a2c6ccab0d
+	md5sums = d6d3b392245a45c6fb5f82037bfdbd19
 	depends_x86_64 = lib32-clang
 	depends_x86_64 = lib32-bzip2
 	depends_x86_64 = lib32-systemd
diff --git a/PKGBUILD b/PKGBUILD
index 69d19a401ae2..c6dad2d69e86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _gitname=darling
 pkgbase=$_gitname-git
 pkgname=('darling-git' 'darling-mach-dkms-git')
 pkgver=r2301.6c63fdc8
-pkgrel=1
+pkgrel=2
 pkgdesc="A Darwin/OS X emulation layer for Linux"
 arch=('x86_64') # Can only be built on x86_64 systems
 url="http://www.darlinghq.org"
@@ -19,7 +19,7 @@ makedepends_x86_64=('gcc-multilib')
 source=('git+https://github.com/darlinghq/darling.git'
 	'dkms.conf')
 md5sums=('SKIP'
-         '2a499e6cc4a31323d82a56a2c6ccab0d')
+         'd6d3b392245a45c6fb5f82037bfdbd19')
 options=('!buildflags')
 
 pkgver() {
@@ -47,9 +47,9 @@ build() {
 	msg2 "Run 'cmake'..."
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 	msg2 "Run 'make'..."
-	make
+	make -j$(nproc)
 	msg2 "Run 'make lkm'..."
-	make lkm
+	make lkm -j$(nproc)
 }
 
 package_darling-git() {
@@ -57,7 +57,7 @@ package_darling-git() {
 	depends=('darling-mach-dkms-git')
 
 	cd "$srcdir/$_gitname/build"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install 
 	install -Dvm755 "$srcdir/$_gitname/src/setup-ld-so.sh" "$pkgdir/usr/bin/darling-setup-ld-so"
 }
 
@@ -68,14 +68,17 @@ package_darling-mach-dkms-git() {
 	            'linux-zen-headers: build modules against the ZEN kernel'
 	            'linux-grsec-headers: build modules against the GRSEC kernel')
 	_srcdest="$pkgdir/usr/src/darling-mach-$pkgver"
+	_srcinstalldest="/usr/src/darling-mach-$pkgver"
 
 	msg2 "Install module sources for DKMS..."
 	install -dm755 $(dirname "$_srcdest")
 	cp -r "$srcdir/$_gitname/src/lkm"       "$_srcdest"
 	cp -r "$srcdir/$_gitname/build/src/lkm" "$_srcdest/migdir"
+    # Copy missing header rtsig.h
+    cp "$srcdir/$_gitname/build/src/startup/rtsig.h" "$_srcdest/include"
 
 	msg2 "Set configuration for DKMS..."
 	install -Dm644 "$srcdir/dkms.conf"      "$_srcdest"
 	sed -i "s|@PKGVER@|$pkgver|g"           "$_srcdest/dkms.conf"
-	sed -i "s|@SRCDEST@|$_srcdest|g"        "$_srcdest/dkms.conf"
+	sed -i "s|@SRCDEST@|$_srcinstalldest|g"        "$_srcdest/dkms.conf"
 }
diff --git a/dkms.conf b/dkms.conf
index d3869b6123f4..e1c442d84e31 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -2,8 +2,8 @@
 PACKAGE_NAME="darling-mach-dkms-git"
 PACKAGE_VERSION="@PKGVER@"
 AUTOINSTALL="yes"
-MAKE="MIGDIR=@SRCDEST@/migdir MIGDIR_REL=migdir make"
-CLEAN="MIGDIR=@SRCDEST@/migdir MIGDIR_REL=migdir make clean"
+MAKE="CPATH=@SRCDEST@/include MIGDIR=@SRCDEST@/migdir MIGDIR_REL=migdir make"
+CLEAN="CPATH=@SRCDEST@/include MIGDIR=@SRCDEST@/migdir MIGDIR_REL=migdir make clean"
 
 BUILT_MODULE_NAME[0]="darling-mach"
 DEST_MODULE_LOCATION[0]="/kernel/misc"