Update build steps since upstream changes

2 files changed, 11 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bf9682d2511..8d4050cc9da4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Mar 26 17:19:46 UTC 2017
+# Mon Mar 27 15:54:02 UTC 2017
 pkgbase = darling-git
 	pkgdesc = A Darwin/OS X emulation layer for Linux
-	pkgver = r1532.a7d584bf
+	pkgver = r1741.a33de880
 	pkgrel = 1
 	url = http://www.darlinghq.org
 	arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = darling-git
 	makedepends = clang
 	makedepends = bison
 	makedepends = flex
-	makedepends = binutils<2.27
 	makedepends = binutils>=2.28
 	depends = darling-mach-dkms-git
 	depends = xz
diff --git a/PKGBUILD b/PKGBUILD
index 09cba6d5af92..620bd28d8fa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname=darling
 pkgname=$_gitname-git
-pkgver=r1532.a7d584bf
+pkgver=r1741.a33de880
 pkgrel=1
 pkgdesc="A Darwin/OS X emulation layer for Linux"
 arch=('x86_64') # Can only be built on x86_64 systems
@@ -12,7 +12,7 @@ groups=('darling-git')
 depends=('darling-mach-dkms-git' 'xz' 'fuse' 'libxml2' 'icu' 'openssl' 'bzip2' 'zlib' 'libsystemd'
 	'wget' 'curl' 'sqlite' 'ruby' 'sed' 'libarchive' 'file' 'python' 'gawk' 'libunwind') # namcap complains about them
 depends_x86_64=('lib32-clang' 'lib32-bzip2' 'lib32-systemd' 'lib32-libxslt')
-makedepends=('git' 'cmake' 'clang' 'bison' 'flex' 'binutils<2.27' 'binutils>=2.28') # binutils-2.27 bug report: https://github.com/darlinghq/darling/issues/157
+makedepends=('git' 'cmake' 'clang' 'bison' 'flex' 'binutils>=2.28')
 makedepends_x86_64=('gcc-multilib')
 source=('git+https://github.com/darlinghq/darling.git')
 md5sums=('SKIP')
@@ -33,34 +33,19 @@ prepare() {
 	#sed -i 's|${CMAKE_INSTALL_PREFIX}/libexec/darling|${CMAKE_INSTALL_PREFIX}/share/darling/prefix|g' src/darling-config.h.in
 	#find . -name CMakeLists.txt -exec sed -i 's|libexec/darling|${CMAKE_INSTALL_PREFIX}/share/darling/prefix|g' {} \;
 
-	msg2 "Make build directories..."
-	mkdir -pv "build/"{i386,x86-64}
+	msg2 "Make build directory..."
+	mkdir -pv "build"
 }
 
 build() {
-	# 32-bit build
-	cd "$srcdir/$_gitname/build/i386"
-	msg2 "Run 'cmake' for 32-bit build..."
-	cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86.cmake -DCMAKE_INSTALL_PREFIX=/usr
-	msg2 "Run 'make' for 32-bit build..."
-	make
-
-	# 64-bit build
-	cd "$srcdir/$_gitname/build/x86-64"
-	msg2 "Run 'cmake' for 64-bit build..."
-	cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr
-	msg2 "Run 'make' for 64-bit build..."
+	cd "$srcdir/$_gitname/build"
+	msg2 "Run 'cmake'..."
+	cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../Toolchain.cmake -DCMAKE_INSTALL_PREFIX=/usr
+	msg2 "Run 'make'..."
 	make
 }
 
 package() {
-	# 32-bit install
-	cd "$srcdir/$_gitname/build/i386"
-	msg2 "Install 32-bit build..."
-	make DESTDIR="$pkgdir" install
-
-	# 64-bit install
-	cd "$srcdir/$_gitname/build/x86-64"
-	msg2 "Install 64-bit build..."
+	cd "$srcdir/$_gitname/build"
 	make DESTDIR="$pkgdir" install
 }