Date: Mon, 31 Oct 2005 00:31:28 +0300 (MSK) From: Andrew Pantyukhin <sat@proxy.gubkin.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88254: update devel/distcc Message-ID: <200510302131.j9ULVS3h053902@proxy.gubkin.ru> Resent-Message-ID: <200510302140.j9ULeF4o092463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88254
>Category: ports
>Synopsis: update devel/distcc
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 30 21:40:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 5.4-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD proxy.gubkin.ru 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #6: Thu Oct 20 19:33:42 MSD 2005 sat@proxy.gubkin.ru:/usr/obj/usr/src/sys/SATPROXYGUB i386
>Description:
Create links to distcc in ${PREFIX}/libexec, just as ccache does.
>How-To-Repeat:
>Fix:
--- distcc.diff begins here ---
diff -urN /usr/ports/devel/distcc/Makefile ./distcc/Makefile
--- /usr/ports/devel/distcc/Makefile Wed Jan 12 07:31:32 2005
+++ ./distcc/Makefile Mon Oct 31 00:25:14 2005
@@ -7,6 +7,7 @@
PORTNAME= distcc
PORTVERSION= 2.18.3
+PORTREVISION= 1
CATEGORIES= devel ipv6
MASTER_SITES= http://distcc.samba.org/ftp/distcc/
@@ -25,10 +26,25 @@
OPTIONS= GNOME "Build GUI monitor based on GNOME" Off \
GTK "Build GUI monitor based on GTK" Off \
- IPV6 "Enable IPV6 (not available on 4.X)" Off
+ IPV6 "Enable IPV6 (not available on 4.X)" Off \
+ COMPILER_LINKS "Create links to distcc for convenience" On
.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_COMPILER_LINKS)
+CCLINKDIR?= libexec/distcc
+PLIST_DIRS= ${CCLINKDIR}
+GNU_COMPILERS= 295 32 33 34 35 40 41
+DISTCC_COMPILERS= cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
+.if ${ARCH}=="i386"
+DISTCC_COMPILERS+= icc icpc
+.endif
+.if defined(EXTRA_COMPILERS)
+DISTCC_COMPILERS+= ${EXTRA_COMPILERS}
+.endif
+PLIST_FILES+= ${DISTCC_COMPILERS:S|^|${CCLINKDIR}/|}
+.endif
+
.if defined(WITH_GNOME)
USE_GNOME= libgnomeui
CONFIGURE_ARGS+= --with-gnome
@@ -68,6 +84,12 @@
@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/distccd.sh \
${PREFIX}/etc/rc.d/distccd.sh
+.if !defined(WITHOUT_COMPILER_LINKS)
+ @${MKDIR} ${PREFIX}/${CCLINKDIR}
+.for link in ${DISTCC_COMPILERS}
+ ${LN} -sf ${PREFIX}/bin/distcc ${PREFIX}/${CCLINKDIR}/${link}
+.endfor
+.endif
post-install: install-doc install-man
@${TOUCH} ${DISTCCD_PIDFILE}
--- distcc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510302131.j9ULVS3h053902>