Fix darling-git since recent upstram changes (pkgrel 16)

5 files changed, 182 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4755e6e636d..3e1aa6987353 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,96 @@
 # Generated by mksrcinfo v8
-# Wed Dec 30 15:12:16 UTC 2015
+# Tue Feb 16 17:42:38 UTC 2016
 pkgbase = darling-git
-	pkgdesc = A Wine-like emulation layer that enables you to run Darwin/OS X apps on Linux
-	pkgver = 689.accadce
-	pkgrel = 14
+	pkgdesc = A Darwin/OS X emulation layer for Linux
+	pkgver = 1128.817c7ce
+	pkgrel = 15
 	url = http://www.darlinghq.org
+	install = darling-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
-	makedepends = nasm
-	makedepends = libkqueue
-	makedepends = gnustep-gui-clang-svn
-	depends = libbsd
-	depends = libsystemd
+	makedepends = clang
+	makedepends = bison
+	makedepends = flex
+	makedepends = linux-headers
+	depends = xz
+	depends = fuse
+	depends = libxml2
+	depends = icu
 	depends = openssl
-	depends = gnustep-corebase-clang-svn
-	optdepends = dmg2dir-git: extract OS X application from .dmg file
-	replaces = darling-multilib-git
-	backup = etc/darling/dylib.conf
-	source = git+https://github.com/LubosD/darling.git
-	source = dyld
-	md5sums = SKIP
-	md5sums = 9313524c87a422c9405ece68bd4ff4f2
-	makedepends_i686 = clang
-	makedepends_i686 = libgl
-	depends_x86_64 = lib32-libbsd
+	depends = lbzip2
+	depends = zlib
+	depends = libunwind
+	depends = curl
+	depends = systemd
+	depends = libffi
+	depends = bzip2
+	depends = libxslt
+	source = git+https://github.com/darlinghq/darling.git
+	source = git+https://github.com/darlinghq/darling-appkit.git
+	source = git+https://github.com/darlinghq/darling-adv_cmds.git
+	source = git+https://github.com/darlinghq/darling-awk.git
+	source = git+https://github.com/darlinghq/darling-bash.git
+	source = git+https://github.com/darlinghq/darling-bzip2.git
+	source = git+https://github.com/darlinghq/darling-cfnetwork.git
+	source = git+https://github.com/darlinghq/darling-compiler-rt.git
+	source = git+https://github.com/darlinghq/darling-corefoundation.git
+	source = git+https://github.com/darlinghq/darling-curl.git
+	source = git+https://github.com/darlinghq/darling-dmg.git
+	source = git+https://github.com/darlinghq/darling-file_cmds.git
+	source = git+https://github.com/darlinghq/darling-foundation.git
+	source = git+https://github.com/darlinghq/darling-grep.git
+	source = git+https://github.com/darlinghq/darling-icu.git
+	source = git+https://github.com/darlinghq/darling-installer.git
+	source = git+https://github.com/darlinghq/darling-less.git
+	source = git+https://github.com/darlinghq/darling-libcxx.git
+	source = git+https://github.com/darlinghq/darling-libcxxabi.git
+	source = git+https://github.com/darlinghq/darling-libdispatch.git
+	source = git+https://github.com/darlinghq/darling-libkqueue.git
+	source = git+https://github.com/darlinghq/darling-liblzma.git
+	source = git+https://github.com/darlinghq/darling-libobjc2.git
+	source = git+https://github.com/darlinghq/darling-libxml2.git
+	source = git+https://github.com/darlinghq/darling-libxslt.git
+	source = git+https://github.com/darlinghq/darling-openssl.git
+	source = git+https://github.com/darlinghq/darling-pcre.git
+	source = git+https://github.com/darlinghq/darling-shell_cmds.git
+	source = git+https://github.com/darlinghq/darling-text_cmds.git
+	source = git+https://github.com/darlinghq/darling-zlib.git
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 	depends_x86_64 = lib32-systemd
-	depends_x86_64 = lib32-openssl
-	makedepends_x86_64 = lib32-clang
-	makedepends_x86_64 = lib32-libgl
+	depends_x86_64 = lib32-libffi
+	depends_x86_64 = lib32-bzip2
+	depends_x86_64 = lib32-libxslt
 
 pkgname = darling-git
 
diff --git a/.gitignore b/.gitignore
index 69f8c9553839..e439b10eb6eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!dyld
+!darling-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 5d6feb95e201..b097290e863a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,51 @@
 # Maintainer: X0rg
 
+_kernel=$(pacman -Qqo /usr/lib/modules/`uname -r` | grep linux | grep -v headers)
 _gitname=darling
 pkgname=$_gitname-git
-pkgver=689.accadce
-pkgrel=14
-pkgdesc="A Wine-like emulation layer that enables you to run Darwin/OS X apps on Linux"
+pkgver=1128.817c7ce
+pkgrel=15
+pkgdesc="A Darwin/OS X emulation layer for Linux"
 arch=('i686' 'x86_64')
 url="http://www.darlinghq.org"
 license=('GPL3')
-depends=('libbsd' 'libsystemd' 'openssl' 'gnustep-corebase-clang-svn')
-depends_x86_64=('lib32-libbsd' 'lib32-systemd'  'lib32-openssl')
-makedepends=('git' 'nasm' 'libkqueue' 'gnustep-gui-clang-svn')
-makedepends_i686=('clang' 'libgl')
-makedepends_x86_64=('lib32-clang' 'lib32-libgl')
-optdepends=('dmg2dir-git: extract OS X application from .dmg file')
-backup=(etc/darling/dylib.conf)
-conflitcs=('darling-multilib-git')
-replaces=('darling-multilib-git')
-source=('git+https://github.com/LubosD/darling.git'
-	'dyld')
-md5sums=('SKIP'
-         '9313524c87a422c9405ece68bd4ff4f2')
+depends=('xz' 'fuse' 'libxml2' 'icu' 'openssl' 'lbzip2' 'zlib' 'libunwind' 'curl' 'systemd' 'libffi' 'bzip2' 'libxslt')
+depends_x86_64=('lib32-systemd' 'lib32-libffi' 'lib32-bzip2' 'lib32-libxslt')
+makedepends=('git' 'clang' 'bison' 'flex' "$_kernel-headers")
+install=$pkgname.install
+source=('git+https://github.com/darlinghq/darling.git'
+	'git+https://github.com/darlinghq/darling-appkit.git'
+	'git+https://github.com/darlinghq/darling-adv_cmds.git'
+	'git+https://github.com/darlinghq/darling-awk.git'
+	'git+https://github.com/darlinghq/darling-bash.git'
+	'git+https://github.com/darlinghq/darling-bzip2.git'
+	'git+https://github.com/darlinghq/darling-cfnetwork.git'
+	'git+https://github.com/darlinghq/darling-compiler-rt.git'
+	'git+https://github.com/darlinghq/darling-corefoundation.git'
+	'git+https://github.com/darlinghq/darling-curl.git'
+	'git+https://github.com/darlinghq/darling-dmg.git'
+	'git+https://github.com/darlinghq/darling-file_cmds.git'
+	'git+https://github.com/darlinghq/darling-foundation.git'
+	'git+https://github.com/darlinghq/darling-grep.git'
+	'git+https://github.com/darlinghq/darling-icu.git'
+	'git+https://github.com/darlinghq/darling-installer.git'
+	'git+https://github.com/darlinghq/darling-less.git'
+	'git+https://github.com/darlinghq/darling-libcxx.git'
+	'git+https://github.com/darlinghq/darling-libcxxabi.git'
+	'git+https://github.com/darlinghq/darling-libdispatch.git'
+	'git+https://github.com/darlinghq/darling-libkqueue.git'
+	'git+https://github.com/darlinghq/darling-liblzma.git'
+	'git+https://github.com/darlinghq/darling-libobjc2.git'
+	'git+https://github.com/darlinghq/darling-libxml2.git'
+	'git+https://github.com/darlinghq/darling-libxslt.git'
+	'git+https://github.com/darlinghq/darling-openssl.git'
+	'git+https://github.com/darlinghq/darling-pcre.git'
+	'git+https://github.com/darlinghq/darling-shell_cmds.git'
+	'git+https://github.com/darlinghq/darling-text_cmds.git'
+	'git+https://github.com/darlinghq/darling-zlib.git')
+md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 pkgver() {
 	cd "$srcdir/$_gitname"
@@ -28,46 +53,63 @@ pkgver() {
 }
 
 prepare() {
-	msg2 "Make 'build' directory..."
-	mkdir -pv "$srcdir/$_gitname/build"{,32}
+	cd "$srcdir/$_gitname"
+
+	msg2 "Initialize git submodules..."
+	git submodule init
+	for submodule in $(grep submodule ".gitmodules" | awk -F '"' '{ print $2 }'); do
+		path=$(git config --list | grep $submodule | head -n1)
+		git config submodule.$submodule.url "$srcdir/$(basename $path .git)"
+		git submodule update $submodule
+	done
+
+	msg2 "Make build directories..."
+	mkdir -pv "build/i386"
+
+	if [[ $CARCH == "x86_64" ]]; then
+		mkdir -pv "build/x86-64"
+		sed -i 's/lib64/lib/' Toolchain-x86_64.cmake
+	else
+		sed -i 's/lib32/lib/' Toolchain-x86.cmake
+	fi
 }
 
 build() {
-	cd "$srcdir/$_gitname/build"
+	cd "$srcdir/$_gitname/build/i386"
 
-	msg2 "Run 'cmake'..."
-	CC="clang" CXX="clang++" CXXFLAGS="${CXXFLAGS//-O2}" cmake .. -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
+	msg2 "Run 'cmake' for 32-bit build..."
+	LDFLAGS="${LDFLAGS//,--as-needed}" cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86.cmake -DCMAKE_INSTALL_PREFIX=/usr
 
-	msg2 "Run 'make'..."
+	msg2 "Run 'make' for 32-bit build..."
 	make
 
 	if [[ $CARCH == "x86_64" ]]; then
-		# 32-bit build on x86_64
-		cd "$srcdir/$_gitname/build32"
-		source "/usr/share/GNUstep32/Makefiles/GNUstep.sh"
-		export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+		cd "$srcdir/$_gitname/build/x86-64"
 
-		msg2 "Run 'cmake' (32-bit)..."
-		CC="clang -m32" CXX="clang++ -m32" CXXFLAGS="${CXXFLAGS//-O2}" cmake .. -DSUFFIX=32 -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
+		msg2 "Run 'cmake' for 64-bit build..."
+		LDFLAGS="${LDFLAGS//,--as-needed}" cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug
 
-		msg2 "Run 'make' (32-bit)..."
+		msg2 "Run 'make' for 64-bit build..."
 		make
 	fi
+
+	cd "$srcdir/$_gitname/src/lkm"
+	msg2 "Build Linux kernel module..."
+	make
 }
 
 package() {
-	cd "$srcdir/$_gitname/build"
-	msg2 "Install..."
+	cd "$srcdir/$_gitname/build/i386"
+	msg2 "Install 32-bit build..."
 	make DESTDIR="$pkgdir" install
 
 	if [[ $CARCH == "x86_64" ]]; then
-		# 32-bit install on x86_64
-		cd "$srcdir/$_gitname/build32"
-		msg2 "Install (32-bit)..."
+		cd "$srcdir/$_gitname/build/x86-64"
+		msg2 "Install 64-bit build..."
 		make DESTDIR="$pkgdir" install
-
-		msg2 "Install script dyld (auto-choosing for dyld32 or dyld64)..."
-		mv "$pkgdir/usr/bin/dyld" "$pkgdir/usr/bin/dyld64"
-		install -Dvm755 "$srcdir/dyld" "$pkgdir/usr/bin/dyld"
 	fi
+
+	cd "$srcdir/$_gitname/src/lkm"
+	msg2 "Install Linux kernel module..."
+	make INSTALL_MOD_PATH="$pkgdir/usr" install
 }
diff --git a/darling-git.install b/darling-git.install
new file mode 100644
index 000000000000..740110ad2ae3
--- /dev/null
+++ b/darling-git.install
@@ -0,0 +1,17 @@
+_depmod() {
+	depmod $(uname -r)
+}
+
+post_install() {
+	_depmod
+	echo -e "Before using darling, you must to load \033[1mdarling-mach\033[0m kernel module."
+}
+
+post_upgrade() {
+	_depmod
+	echo -e "You must to reload \033[1mdarling-mach\033[0m kernel module to use new version."
+}
+
+post_remove() {
+	_depmod
+}
diff --git a/dyld b/dyld
deleted file mode 100644
index 91f702f63b4e..000000000000
--- a/dyld
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/sh
-
-if [[ -f $1 ]]; then
-	file -b $1 | grep -q "Mach-O" | grep -q "executable" 2> /dev/null || binary=$1
-fi
-
-if [[ -n $binary && $(file -b $binary) == *x86_64* ]]; then
-	echo -e "\t\t\033[1;44;37mDarling 64-bit:\033[0;44;37m `basename $binary`\033[0m"
-	/usr/bin/dyld64 $@
-elif [[ -n $binary && $(file -b $binary) == *i386* ]]; then
-	echo -e "\t\t\033[1;44;37mDarling 32-bit:\033[0;44;37m `basename $binary`\033[0m"
-	/usr/bin/dyld32 $@
-else
-	echo -e "\t\t\033[1;44;37mDarling 64-bit\033[0m"
-	/usr/bin/dyld64 $@
-fi