Mercurial > gub
changeset 5526:061f606b7c0e
no_patch cleanups.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 21 Aug 2009 09:21:09 +0200 |
| parents | a12219e37429 |
| children | dcd2cd3e4f95 |
| files | gub/specs/coreutils.py gub/specs/gzip.py |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/coreutils.py Fri Aug 21 09:19:48 2009 +0200 +++ b/gub/specs/coreutils.py Fri Aug 21 09:21:09 2009 +0200 @@ -14,20 +14,22 @@ class Coreutils__tools (tools.AutoBuild): # source = 'ftp://ftp.gnu.org/pub/gnu/coreutils/coreutils-6.12.tar.gz' source = 'http://ftp.gnu.org/pub/gnu/coreutils/coreutils-7.4.tar.gz' - if 'BOOTSTRAP' in os.environ.keys () or no_patch: - # patches = ['coreutils-6.12-shared-autoconf.patch'] - pass + if 'BOOTSTRAP' in os.environ.keys (): + patches = ['coreutils-6.12-shared-autoconf.patch'] else: patches = ['coreutils-6.12-shared-automake.patch'] + if no_patch: + patches = [] def patch (self): - tools.AutoBuild.patch (self) - if not self.patches: + if no_patch: self.file_sub ([('noinst_LIBRARIES', 'lib_LIBRARIES')], '%(srcdir)s/lib/gnulib.mk') self.file_sub ([ (r'libcoreutils[.]a', 'libcoreutils.so'), ('[.][.]/lib/libcoreutils.so ([$][(]LIBINTL[)]) [.][.]/lib/libcoreutils.so', r'-L../lib -lcoreutils \1'), ], '%(srcdir)s/src/Makefile.in') + else: + tools.AutoBuild.patch (self) def _get_build_dependencies (self): if 'BOOTSTRAP' in os.environ.keys () or no_patch: return []
--- a/gub/specs/gzip.py Fri Aug 21 09:19:48 2009 +0200 +++ b/gub/specs/gzip.py Fri Aug 21 09:21:09 2009 +0200 @@ -6,6 +6,8 @@ class Gzip__tools (tools.AutoBuild): source = 'http://ftp.gnu.org/pub/gnu/gzip/gzip-1.3.12.tar.gz' patches = ['gzip-1.3.12-glibc-compat.patch'] + if no_patch: + patches = [] def patch (self): if no_patch: for i in ('gzip.c', 'utimens.c', 'utimens.h'):