diff options
| -rw-r--r-- | core/distcc/APKBUILD | 19 | ||||
| -rw-r--r-- | core/distcc/distcc-3.1-clone.patch | 14 |
2 files changed, 28 insertions, 5 deletions
diff --git a/core/distcc/APKBUILD b/core/distcc/APKBUILD index 13327c20..54a373ef 100644 --- a/core/distcc/APKBUILD +++ b/core/distcc/APKBUILD @@ -1,19 +1,27 @@ pkgname=distcc -pkgver=2.18.3 +pkgver=3.1 pkgrel=0 pkgdesc="A distributed C, C++, Obj C compiler" -url="http://distcc.samba.org" +url="http://distcc.org" license="GPL-2" depends="popt" makedepends="popt-dev" -source="http://distcc.samba.org/ftp/distcc/distcc-2.18.3.tar.bz2 +source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2 + distcc-3.1-clone.patch distccd.initd distccd.confd" subpackages="$pkgname-doc" build () { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --without-gtk --sysconfdir=/etc + for i in ../*.patch; do + msg "applying $i" + patch -p1 < $i || return 1 + done + ./configure --prefix=/usr \ + --without-gtk \ + --sysconfdir=/etc \ + --mandir=/usr/share/man make || return 1 make DESTDIR="$pkgdir" install @@ -29,6 +37,7 @@ build () ln -sf /usr/bin/$pkgname "$d"/cpp } -md5sums="0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 +md5sums="a1a9d3853df7133669fffec2a9aab9f3 distcc-3.1.tar.bz2 +29fe296aa2985eea7af7402f421db187 distcc-3.1-clone.patch 5cf566965873279fedc16934a2ba6cd0 distccd.initd e9e0ccc9f5813b9c3c88c8687b2ebc73 distccd.confd" diff --git a/core/distcc/distcc-3.1-clone.patch b/core/distcc/distcc-3.1-clone.patch new file mode 100644 index 00000000..70e8f835 --- /dev/null +++ b/core/distcc/distcc-3.1-clone.patch @@ -0,0 +1,14 @@ +--- distcc-3.1.orig/lzo/minilzo.c Mon Jan 12 09:05:53 2009 ++++ distcc-3.1/lzo/minilzo.c Mon Jan 12 10:27:02 2009 +@@ -1298,9 +1298,9 @@ + #if defined(__LZO_CHECKER) + return 0; + #else +- const int clone[] = {1, 2, 0}; ++ const int _clone[] = {1, 2, 0}; + const int *q; +- q = clone; ++ q = _clone; + return (*q) ? 0 : 1; + #endif + } |