diff options
| author |   Markus Duft <mduft@gentoo.org> | 2008-12-17 09:43:16 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2008-12-17 09:43:16 +0000 |
| commit | 9fd689f95d3bf0fee910fbc564390d8125d29edc (patch) | |
| tree | ec6d803bc0d601d924d294910a6122003c9c54be /dev-util | |
| parent | New patch for sparc-fbsd, bug 159584. (diff) | |
| download | gentoo-2-9fd689f95d3bf0fee910fbc564390d8125d29edc.tar.gz gentoo-2-9fd689f95d3bf0fee910fbc564390d8125d29edc.tar.bz2 gentoo-2-9fd689f95d3bf0fee910fbc564390d8125d29edc.zip | |
updated fast install patch to correctly add files to dist rules
(Portage version: 2.1.4.5)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/confix/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/confix/files/2.1.0/fast-install.patch | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog index 986c45abe860..c5bb13821f1e 100644 --- a/dev-util/confix/ChangeLog +++ b/dev-util/confix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/confix # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.6 2008/12/09 08:30:18 mduft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.7 2008/12/17 09:43:16 mduft Exp $ + + 17 Dec 2008; Markus Duft <mduft@gentoo.org> + files/2.1.0/fast-install.patch: + updated fast install patch to correctly add files to dist rules *confix-2.1.0-r2 (09 Dec 2008) diff --git a/dev-util/confix/files/2.1.0/fast-install.patch b/dev-util/confix/files/2.1.0/fast-install.patch index aaec4d86f0d8..4db79b837991 100644 --- a/dev-util/confix/files/2.1.0/fast-install.patch +++ b/dev-util/confix/files/2.1.0/fast-install.patch @@ -1,6 +1,6 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.0/libconfix/core/automake/file_installer.py --- Confix-2.1.0.orig/libconfix/core/automake/file_installer.py 2008-10-21 11:17:30 +0200 -+++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2008-11-05 13:17:14 +0100 ++++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2008-12-17 10:35:54 +0100 @@ -22,6 +22,11 @@ from libconfix.core.utils.paragraph import Paragraph from libconfix.core.utils import const @@ -50,7 +50,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. ## buildmod.makefile_am().add_lines(helper_automake.format_rule( ## targets=[FileInstaller.TARGET_INSTALL_PUBLIC])) -@@ -264,6 +279,55 @@ +@@ -264,6 +279,56 @@ files=filelist) pass pass @@ -89,6 +89,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. + _i=0 + _f=[] + for f in files: ++ makefile_am.add_extra_dist(f) + _f.append(f) + _i+=1 + if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): @@ -106,7 +107,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. def automake_install_datafiles_(self, makefile_am): for dirname, filelist in self.dir2filedict_(file2dirdict=self.datafiles_).iteritems(): -@@ -278,6 +342,50 @@ +@@ -278,6 +343,51 @@ pass pass @@ -140,6 +141,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. + _i=0 + _f=[] + for f in files: ++ makefile_am.add_extra_dist(f) + _f.append(f) + _i+=1 + if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): @@ -157,7 +159,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. def automake_install_prefixfiles_(self, makefile_am): for dirname, filelist in self.dir2filedict_(file2dirdict=self.prefixfiles_).iteritems(): # define directory -@@ -291,17 +399,92 @@ +@@ -291,17 +401,93 @@ pass pass @@ -192,6 +194,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. + _i=0 + _f=[] + for f in files: ++ makefile_am.add_extra_dist(f) + _f.append(f) + _i+=1 + if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): @@ -255,7 +258,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. makefile_am.add_element(install_local_rule) makefile_am.add_element(clean_local_rule) -@@ -321,20 +504,36 @@ +@@ -321,20 +507,37 @@ commands=['-$(mkinstalldirs) '+targetdir])) # copy files @@ -292,6 +295,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1. - commands=['rm -f '+targetfile])) - install_local_rule.add_prerequisite(targetfile) - clean_local_rule.add_prerequisite(targetfile+'-clean') ++ makefile_am.add_extra_dist(f) + _f.append(f) + _i+=1 + if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files): |