diff options
-rw-r--r-- | sys-devel/distcc/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/distcc/files/2.18/distcc-config.patch | 35 |
2 files changed, 6 insertions, 37 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index 939913cd279d..18c685cc2dfb 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/distcc -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.183 2008/11/16 16:36:37 matsuu Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.184 2008/11/20 16:47:58 vapier Exp $ + + 20 Nov 2008; Mike Frysinger <vapier@gentoo.org> + -files/2.18/distcc-config.patch: + Drop unused patch. 16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> files/3.0/init, -distcc-3.0-r3.ebuild: diff --git a/sys-devel/distcc/files/2.18/distcc-config.patch b/sys-devel/distcc/files/2.18/distcc-config.patch deleted file mode 100644 index d06a7844c533..000000000000 --- a/sys-devel/distcc/files/2.18/distcc-config.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- /usr/bin/distcc-config 2005-04-02 16:08:44.000000000 +0100 -+++ distcc-config-adq 2005-04-07 14:06:23.000000000 +0100 -@@ -65,7 +65,22 @@ - def permissions(path,user,group): - for file in os.listdir(path): - #print 'Configuring',path+file+'...' -- os.chown(path+file,user,group) -+ os.chmod(path+file,0755) -+ -+def installoverrides(chost): -+ for file in ['gcc', 'cc', 'c++', 'g++']: -+ path = '/usr/lib/distcc/bin/' -+ if os.path.exists('/usr/bin/'+chost+'-'+file): -+ if os.path.exists(path+file): -+ os.unlink(path+file) -+ override_cmd = open(path+file, 'w') -+ override_cmd.write('#!/bin/sh\n') -+ override_cmd.write('exec '+chost+'-'+file+' \"$@\"\n'); -+ os.chown(path+file,user,group) -+ override_cmd = open(path+'cc', 'w') -+ override_cmd.write('#!/bin/sh\n') -+ override_cmd.write('exec '+chost+'-gcc'+' \"$@\"\n'); -+ os.chown(path+'cc',user,group) - - def installlinks(chost=''): - for file in ['gcc', 'cc', 'c++', 'g++']: -@@ -139,7 +154,7 @@ - makeconf = open('/etc/make.conf', 'r').read() - chost = re.compile('CHOST="(.*)"').search(makeconf).group(1) - print 'Creating symlinks...' -- installlinks() -+ installoverrides(chost) - installlinks(chost) - - print 'Checking permissions...' |