summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchala2017-02-05 18:24:37 -0800
committerSchala2017-02-05 18:24:37 -0800
commit4debde961cfb66f5cf74e148f0cde14a61d23501 (patch)
tree4e86ee50839eaadface20a5df14a67522867b9b2
parentc6b26800430f3cdde75854bcbda6e71fde6ec8b0 (diff)
downloadaur-4debde961cfb66f5cf74e148f0cde14a61d23501.tar.gz
possible unnecessary patches, but better safe than sorry
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD18
-rw-r--r--cctools-ld64-1.patch22
-rw-r--r--cctools-ld64-2.patch11
4 files changed, 53 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d266bfcd971..bf58b56fb04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Feb 5 22:41:24 UTC 2017
+# Mon Feb 6 02:24:07 UTC 2017
pkgbase = cctools-git
pkgdesc = Apple cctools port for Linux
pkgver = 146
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/tpoechtrager/cctools-port
arch = i686
arch = x86_64
@@ -16,7 +16,11 @@ pkgbase = cctools-git
conflicts = x86_64-apple-darwin-binutils
conflicts = cctools
source = git+https://github.com/tpoechtrager/cctools-port.git
+ source = cctools-ld64-1.patch
+ source = cctools-ld64-2.patch
md5sums = SKIP
+ md5sums = 2dc516ac75bce198fc7dcb2a0fd0d4ee
+ md5sums = 52b7a03acaf34cbeed19b5b16e01deed
pkgname = cctools-git
diff --git a/PKGBUILD b/PKGBUILD
index 86cc97ea97a..bb215ada106 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
pkgname=cctools-git
pkgdesc="Apple cctools port for Linux"
pkgver=146
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="https://github.com/tpoechtrager/cctools-port"
license=("APSL")
@@ -9,17 +9,26 @@ depends=(llvm)
makedepends=(gcc-objc git)
provides=(x86_64-apple-darwin-binutils cctools)
conflicts=(x86_64-apple-darwin-binutils cctools)
-source=("git+https://github.com/tpoechtrager/cctools-port.git")
-md5sums=('SKIP')
+source=("git+https://github.com/tpoechtrager/cctools-port.git"
+"cctools-ld64-1.patch" "cctools-ld64-2.patch")
+md5sums=('SKIP'
+ '2dc516ac75bce198fc7dcb2a0fd0d4ee'
+ '52b7a03acaf34cbeed19b5b16e01deed')
pkgver() {
cd cctools-port
echo $(git rev-list --count HEAD)
}
+prepare() {
+ cd cctools-port/cctools
+ patch -p0 -i ${srcdir}/cctools-ld64-1.patch
+ patch -p0 -i ${srcdir}/cctools-ld64-2.patch
+}
+
build() {
cd cctools-port/cctools
- ./autogen.sh
+ NOCONFIGURE=1 ./autogen.sh
./configure \
--prefix=/usr \
--target=x86_64-apple-darwin \
@@ -31,4 +40,5 @@ build() {
package() {
cd cctools-port/cctools
make DESTDIR="$pkgdir" install
+ install -Dm644 APPLE_LICENSE "$pkgdir/usr/share/licenses/cctools/APPLE_LICENSE"
}
diff --git a/cctools-ld64-1.patch b/cctools-ld64-1.patch
new file mode 100644
index 00000000000..f1dd2bfaec2
--- /dev/null
+++ b/cctools-ld64-1.patch
@@ -0,0 +1,22 @@
+--- ld64/src/3rd/helper_backup.h 2013-02-24 11:26:01.159718369 -0800
++++ ld64/src/3rd/helper.h 2013-02-24 11:27:22.107716807 -0800
+@@ -1,6 +1,10 @@
+ #ifndef _HELPER_H
+ #define _HELPER_H
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include <mach/mach_time.h>
+ #include <mach/mach_host.h>
+ #include <mach/host_info.h>
+@@ -30,4 +34,8 @@
+
+ uint64_t mach_absolute_time(void);
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
diff --git a/cctools-ld64-2.patch b/cctools-ld64-2.patch
new file mode 100644
index 00000000000..56c473dfacd
--- /dev/null
+++ b/cctools-ld64-2.patch
@@ -0,0 +1,11 @@
+--- ld64/src/ld/Snapshot.cpp 2013-10-02 20:08:31.672088145 +0200
++++ ld64/src/ld/Snapshot.cpp 2013-10-02 20:08:42.330088934 +0200
+@@ -15,7 +15,7 @@
+ #include <sys/stat.h>
+ #include <libgen.h>
+ #include <time.h>
+-#include <Block.h>
++#include <BlocksRuntime/Block.h>
+
+ #include "Snapshot.h"
+ #include "Options.h"