distcc-3.2 "Back in black" 2011-10-11 FEATURES: * IPv6 support * Optional support for GSS-API authentication * Added an environment variable DISTCC_SKIP_LOCAL_RETRY for skipping the local retry in case of a remote compilation failure * Some constants that were previously hard-coded in the sources are now configurable via environment variables: DISTCC_MAX_DISCREPANCY, DISTCC_IO_TIMEOUT BUG FIXES: * Fixed the following 20 issues <http://code.google.com/p/distcc/issues/list>: 30: 3.0 on OSX: ValueError: Expected absolute path, but got '(framework'. 33: distcc --scan-includes dumps core 34: Zeroconf fails if avahi supports IPv6 35: Include server internal error: '<class 'sre_constants.error'>: ('bogus escape (end of line)',)' 36: distcc-mon-gnome displays multiple rows for same host/slot 39: build with gcc 4.1 snprintf.h error "expected declaration specifiers" 42: distcc --show-hosts fails when using Avahi with IPv6 support and +zeroconf for distcc. 43: Remove duplicate hosts from zeroconf list 44: Failed tests on make check (gentoo gcc-4.3.3) 46: Add TAGS target to Makefile.in 49: make check fails on PreprocessAsm_Case 57: Fix warnings 58: PUMP mode can`t PARSE the HOSTS 60: CPlusPlus test case fails with GCC 4.4.1 61: Gdb tests fail in pumped mode on Ubuntu 9.10 amd64 66: pump mode fails to compile certain KDE-4 packages, finds/looks for incorrect headers 70: variable overlapping causing errors.. 75: include_server documentation, distcc_fallback flag incorrect 81: distcc 3.1 will not compile correctly with current version of gccdiff -r1.35 -r1.36 pkgsrc/devel/distcc/Makefile
(adam)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.35 2013/07/12 10:44:55 jperkin Exp $ | 1 | # $NetBSD: Makefile,v 1.36 2014/04/25 16:13:31 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME} | 3 | PKGNAME= ${DISTNAME:S/rc1//} | |
4 | PKGREVISION= 2 | |||
5 | COMMENT= Tool for distributed C/C++ compiling | 4 | COMMENT= Tool for distributed C/C++ compiling | |
6 | 5 | |||
7 | .include "Makefile.common" | 6 | .include "Makefile.common" | |
8 | 7 | |||
9 | PKG_SYSCONFSUBDIR= distcc | 8 | PKG_SYSCONFSUBDIR= distcc | |
10 | RCD_SCRIPTS= distccd | 9 | RCD_SCRIPTS= distccd | |
11 | 10 | |||
12 | .include "../../mk/bsd.prefs.mk" | 11 | .include "../../mk/bsd.prefs.mk" | |
13 | 12 | |||
14 | DISTCC_USER?= distcc | 13 | DISTCC_USER?= distcc | |
15 | DISTCC_GROUP?= distcc | 14 | DISTCC_GROUP?= distcc | |
16 | PKG_GROUPS= ${DISTCC_GROUP} | 15 | PKG_GROUPS= ${DISTCC_GROUP} | |
17 | PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP} | 16 | PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP} |
@@ -1,40 +1,40 @@ | @@ -1,40 +1,40 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.10 2012/10/31 11:16:53 asau Exp $ | 1 | # $NetBSD: Makefile.common,v 1.11 2014/04/25 16:13:31 adam Exp $ | |
2 | # used by devel/distcc-pump/Makefile | 2 | # used by devel/distcc-pump/Makefile | |
3 | # used by devel/distccmon-gnome/Makefile | 3 | # used by devel/distccmon-gnome/Makefile | |
4 | # used by devel/distccmon-gtk/Makefile | 4 | # used by devel/distccmon-gtk/Makefile | |
5 | 5 | |||
6 | DISTCC_VERSION= 3.1 | 6 | # XXX: in the future, remove rc1 substitutions from Makefiles mentioned above | |
7 | 7 | DISTNAME= distcc-3.2rc1 | ||
8 | DISTNAME= distcc-${DISTCC_VERSION} | 8 | CATEGORIES= devel | |
9 | CATEGORIES= devel | 9 | MASTER_SITES= http://distcc.googlecode.com/files/ | |
10 | MASTER_SITES= http://distcc.googlecode.com/files/ | 10 | EXTRACT_SUFX= .tar.bz2 | |
11 | EXTRACT_SUFX= .tar.bz2 | 11 | ||
12 | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | ||
13 | MAINTAINER= pkgsrc-users@NetBSD.org | 13 | HOMEPAGE= http://distcc.org/ | |
14 | HOMEPAGE= http://distcc.org/ | 14 | LICENSE= gnu-gpl-v2 | |
15 | 15 | |||
16 | DISTINFO_FILE= ${.CURDIR}/../../devel/distcc/distinfo | 16 | DISTINFO_FILE= ${.CURDIR}/../../devel/distcc/distinfo | |
17 | PATCHDIR= ${.CURDIR}/../../devel/distcc/patches | 17 | PATCHDIR= ${.CURDIR}/../../devel/distcc/patches | |
18 | 18 | |||
19 | USE_TOOLS+= gmake | 19 | USE_TOOLS+= gmake | |
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | CONFIGURE_ARGS+= --disable-Werror | 21 | CONFIGURE_ARGS+= --disable-Werror | |
22 | CONFIGURE_ARGS+= --enable-rfc2553 | 22 | CONFIGURE_ARGS+= --enable-rfc2553 | |
23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 23 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
24 | #CONFIGURE_ENV+= ac_cv_path_PYTHON=/dev/null | 24 | #CONFIGURE_ENV+= ac_cv_path_PYTHON=/dev/null | |
25 | 25 | |||
26 | CHECK_PORTABILITY_SKIP+= contrib/redhat/* | 26 | CHECK_PORTABILITY_SKIP+= contrib/redhat/* | |
27 | 27 | |||
28 | SUBST_CLASSES+= doc | 28 | SUBST_CLASSES+= doc | |
29 | SUBST_STAGE.doc= post-patch | 29 | SUBST_STAGE.doc= post-patch | |
30 | SUBST_FILES.doc= src/distcc.c src/hosts.c | 30 | SUBST_FILES.doc= src/distcc.c src/hosts.c | |
31 | SUBST_SED.doc= -e "s|%s/distcc/hosts|%s/hosts|g" | 31 | SUBST_SED.doc= -e "s|%s/distcc/hosts|%s/hosts|g" | |
32 | SUBST_MESSAGE.doc= Fixing paths. | 32 | SUBST_MESSAGE.doc= Fixing paths. | |
33 | 33 | |||
34 | .if empty(PKGNAME:Mdistcc-[0-9]*) | 34 | .if empty(PKGNAME:Mdistcc-[0-9]*) | |
35 | DEPENDS+= distcc>=${DISTCC_VERSION}:../../devel/distcc | 35 | DEPENDS+= distcc>=${PKGVERSION_NOREV}:../../devel/distcc | |
36 | .endif | 36 | .endif | |
37 | 37 | |||
38 | INSTALLATION_DIRS+= bin | 38 | INSTALLATION_DIRS+= bin | |
39 | 39 | |||
40 | .include "../../devel/popt/buildlink3.mk" | 40 | .include "../../devel/popt/buildlink3.mk" |
@@ -1,13 +1,10 @@ | @@ -1,13 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.21 2013/02/03 14:02:31 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.22 2014/04/25 16:13:31 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (distcc-3.1.tar.bz2) = 30663e8ff94f13c0553fbfb928adba91814e1b3a | 3 | SHA1 (distcc-3.2rc1.tar.bz2) = 7564e4a4890ad6ff78ec0de620329b71179361e7 | |
4 | RMD160 (distcc-3.1.tar.bz2) = 82229c230e6917b0df7db275460579b02dbf6b60 | 4 | RMD160 (distcc-3.2rc1.tar.bz2) = 505447b910d90ea403a98fe0d0a3a0fa92cd7039 | |
5 | Size (distcc-3.1.tar.bz2) = 588820 bytes | 5 | Size (distcc-3.2rc1.tar.bz2) = 609904 bytes | |
6 | SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372 | 6 | SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372 | |
7 | SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca | 7 | SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca | |
8 | SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647 | 8 | SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647 | |
9 | SHA1 (patch-ad) = 79ce3ea1b7dd75dce1654dd31eaa372174f8f5d1 | |||
10 | SHA1 (patch-ae) = d4e5eba767f08a1c346c0223ddf88e98a5ed7c59 | 9 | SHA1 (patch-ae) = d4e5eba767f08a1c346c0223ddf88e98a5ed7c59 | |
11 | SHA1 (patch-src_dotd.c) = 20a540e724858c62ca0b179860787508e72a2d00 | |||
12 | SHA1 (patch-src_emaillog.c) = be202a47d82d412d572bee5ff29e2ebc707922c4 | |||
13 | SHA1 (patch-src_io.c) = 5c662a4f9af20b5cffbd6285a3b0d6d6c4066571 | 10 | SHA1 (patch-src_io.c) = 5c662a4f9af20b5cffbd6285a3b0d6d6c4066571 |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2014/01/25 10:30:01 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2014/04/25 16:13:32 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/-/-pump-/} | 3 | PKGNAME= ${DISTNAME:S/-/-pump-/:S/rc1//} | |
4 | PKGREVISION= 4 | |||
5 | COMMENT= Accelerated remote compilation with distcc | 4 | COMMENT= Accelerated remote compilation with distcc | |
6 | 5 | |||
7 | .include "../../devel/distcc/Makefile.common" | 6 | .include "../../devel/distcc/Makefile.common" | |
8 | 7 | |||
9 | PY_PATCHPLIST= yes | 8 | PY_PATCHPLIST= yes | |
10 | PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1 | 9 | PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1 | |
11 | 10 | |||
12 | # check patch-ae for build and install targets | 11 | # check patch-ae for build and install targets | |
13 | BUILD_TARGET= pump include-server | 12 | BUILD_TARGET= pump include-server | |
14 | INSTALL_TARGET= install-include-server | 13 | INSTALL_TARGET= install-include-server | |
15 | 14 | |||
16 | .include "../../lang/python/extension.mk" | 15 | .include "../../lang/python/extension.mk" | |
17 | .include "../../mk/bsd.pkg.mk" | 16 | .include "../../mk/bsd.pkg.mk" |
@@ -1,28 +1,27 @@ | @@ -1,28 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.49 2014/02/12 23:17:46 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.50 2014/04/25 16:13:32 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/-/-gnome-/} | 3 | PKGNAME= ${DISTNAME:S/-/-gnome-/:S/rc1//} | |
4 | PKGREVISION= 30 | |||
5 | CATEGORIES+= gnome | 4 | CATEGORIES+= gnome | |
6 | COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler | 5 | COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler | |
7 | 6 | |||
8 | .include "../../devel/distcc/Makefile.common" | 7 | .include "../../devel/distcc/Makefile.common" | |
9 | 8 | |||
10 | USE_TOOLS+= pkg-config | 9 | USE_TOOLS+= pkg-config | |
11 | CONFIGURE_ARGS+= --with-gnome | 10 | CONFIGURE_ARGS+= --with-gnome | |
12 | 11 | |||
13 | BUILD_TARGET= distccmon-gnome | 12 | BUILD_TARGET= distccmon-gnome | |
13 | INSTALLATION_DIRS+= share/distcc | |||
14 | 14 | |||
15 | do-install: | 15 | do-install: | |
16 | ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${DESTDIR}${PREFIX}/bin | 16 | ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${DESTDIR}${PREFIX}/bin | |
17 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/distcc | |||
18 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ | 17 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ | |
19 | ${DESTDIR}${PREFIX}/share/distcc | 18 | ${DESTDIR}${PREFIX}/share/distcc | |
20 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ | 19 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ | |
21 | ${DESTDIR}${PREFIX}/share/distcc | 20 | ${DESTDIR}${PREFIX}/share/distcc | |
22 | 21 | |||
23 | .include "../../devel/libgnome/buildlink3.mk" | 22 | .include "../../devel/libgnome/buildlink3.mk" | |
24 | .include "../../devel/libgnomeui/buildlink3.mk" | 23 | .include "../../devel/libgnomeui/buildlink3.mk" | |
25 | .include "../../devel/pango/buildlink3.mk" | 24 | .include "../../devel/pango/buildlink3.mk" | |
26 | .include "../../net/avahi/buildlink3.mk" | 25 | .include "../../net/avahi/buildlink3.mk" | |
27 | .include "../../x11/gtk2/buildlink3.mk" | 26 | .include "../../x11/gtk2/buildlink3.mk" | |
28 | .include "../../mk/bsd.pkg.mk" | 27 | .include "../../mk/bsd.pkg.mk" |
@@ -1,30 +1,29 @@ | @@ -1,30 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.29 2013/10/10 14:42:04 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.30 2014/04/25 16:13:32 adam Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/-/-gtk-/} | 3 | PKGNAME= ${DISTNAME:S/-/-gtk-/:S/rc1//} | |
4 | PKGREVISION= 19 | |||
5 | COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler | 4 | COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler | |
6 | 5 | |||
7 | .include "../../devel/distcc/Makefile.common" | 6 | .include "../../devel/distcc/Makefile.common" | |
8 | 7 | |||
9 | USE_TOOLS+= pkg-config | 8 | USE_TOOLS+= pkg-config | |
10 | CONFIGURE_ARGS+= --with-gtk | 9 | CONFIGURE_ARGS+= --with-gtk | |
11 | 10 | |||
12 | SUBST_CLASSES+= gtk | 11 | SUBST_CLASSES+= gtk | |
13 | SUBST_STAGE.gtk= post-patch | 12 | SUBST_STAGE.gtk= post-patch | |
14 | SUBST_FILES.gtk= gnome/distccmon-gnome.desktop src/mon-gnome.c | 13 | SUBST_FILES.gtk= gnome/distccmon-gnome.desktop src/mon-gnome.c | |
15 | SUBST_SED.gtk= -e "s/distccmon-gnome/distccmon-gtk/g" | 14 | SUBST_SED.gtk= -e "s/distccmon-gnome/distccmon-gtk/g" | |
16 | SUBST_MESSAGE.gtk= Renaming -gnome to -gtk. | 15 | SUBST_MESSAGE.gtk= Renaming -gnome to -gtk. | |
17 | 16 | |||
18 | BUILD_TARGET= distccmon-gnome | 17 | BUILD_TARGET= distccmon-gnome | |
18 | INSTALLATION_DIRS+= share/distcc | |||
19 | 19 | |||
20 | do-install: | 20 | do-install: | |
21 | ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome \ | 21 | ${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome \ | |
22 | ${DESTDIR}${PREFIX}/bin/distccmon-gtk | 22 | ${DESTDIR}${PREFIX}/bin/distccmon-gtk | |
23 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/distcc | |||
24 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ | 23 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \ | |
25 | ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk-icon.png | 24 | ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk-icon.png | |
26 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ | 25 | ${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \ | |
27 | ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk.desktop | 26 | ${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk.desktop | |
28 | 27 | |||
29 | .include "../../x11/gtk2/buildlink3.mk" | 28 | .include "../../x11/gtk2/buildlink3.mk" | |
30 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |