summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXorg2016-12-04 13:00:00 +0100
committerXorg2016-12-04 13:00:06 +0100
commit6b5dd2786681c6712f340c4f9fd2af578ed4f974 (patch)
tree4e650d428dbf0fe6f6da6cf7c81d35097dfceb43
parent09750ea7f4937f4c2c165d0b126ec8aa1e7e0724 (diff)
downloadaur-6b5dd2786681c6712f340c4f9fd2af578ed4f974.tar.gz
Drop use of /usr/libexec and fix missing dependencies
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD18
2 files changed, 28 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3bbe032df9f..9d0bbcef9f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Nov 26 12:06:38 UTC 2016
+# Sun Dec 4 12:00:00 UTC 2016
pkgbase = darling-git
pkgdesc = A Darwin/OS X emulation layer for Linux
- pkgver = r1352.f7afcfc
+ pkgver = r1374.2536b7d
pkgrel = 1
url = http://www.darlinghq.org
arch = x86_64
@@ -13,26 +13,31 @@ pkgbase = darling-git
makedepends = clang
makedepends = bison
makedepends = flex
+ makedepends = binutils<2.27
depends = darling-mach-dkms-git
depends = xz
depends = fuse
depends = libxml2
depends = icu
depends = openssl
- depends = lbzip2
- depends = zlib
- depends = libunwind
- depends = curl
- depends = systemd
- depends = libffi
depends = bzip2
- depends = libxslt
+ depends = zlib
+ depends = libsystemd
depends = wget
+ depends = curl
+ depends = sqlite
+ depends = ruby
+ depends = sed
+ depends = libarchive
+ depends = file
+ depends = python
+ depends = gawk
+ depends = libunwind
source = git+https://github.com/darlinghq/darling.git
md5sums = SKIP
- depends_x86_64 = lib32-systemd
- depends_x86_64 = lib32-libffi
+ depends_x86_64 = lib32-clang
depends_x86_64 = lib32-bzip2
+ depends_x86_64 = lib32-systemd
depends_x86_64 = lib32-libxslt
makedepends_x86_64 = gcc-multilib
diff --git a/PKGBUILD b/PKGBUILD
index 947092900dd..78b426151f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
_gitname=darling
pkgname=$_gitname-git
-pkgver=r1352.f7afcfc
+pkgver=r1374.2536b7d
pkgrel=1
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"
license=('GPL3')
groups=('darling-git')
-depends=('darling-mach-dkms-git' 'xz' 'fuse' 'libxml2' 'icu' 'openssl' 'lbzip2' 'zlib' 'libunwind' 'curl' 'systemd' 'libffi' 'bzip2' 'libxslt' 'wget')
-depends_x86_64=('lib32-systemd' 'lib32-libffi' 'lib32-bzip2' 'lib32-libxslt')
-makedepends=('git' 'cmake' 'clang' 'bison' 'flex')
+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.27 bug report: https://github.com/darlinghq/darling/issues/157
makedepends_x86_64=('gcc-multilib')
source=('git+https://github.com/darlinghq/darling.git')
md5sums=('SKIP')
@@ -28,6 +29,11 @@ prepare() {
sed -i 's|url = ../|url = https://github.com/darlinghq/|g' .gitmodules
git submodule update --init --recursive
+ msg2 "Forbid libexec use..."
+ sed -i 's|${DARLING_PREFIX}/libexec/darling|${DARLING_PREFIX}/share/darling/prefix|g' src/dyld/darling
+ 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}
sed -i 's/lib64/lib/' Toolchain-x86_64.cmake
@@ -37,14 +43,14 @@ build() {
# 32-bit build
cd "$srcdir/$_gitname/build/i386"
msg2 "Run 'cmake' for 32-bit build..."
- LDFLAGS="${LDFLAGS//,--as-needed}" cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86.cmake -DCMAKE_INSTALL_PREFIX=/usr
+ 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..."
- LDFLAGS="${LDFLAGS//,--as-needed}" cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr
+ cmake ../.. -DCMAKE_TOOLCHAIN_FILE=../../Toolchain-x86_64.cmake -DCMAKE_INSTALL_PREFIX=/usr
msg2 "Run 'make' for 64-bit build..."
make
}