Mercurial > gub
changeset 4492:03defd5fabdc
Revert to libtool 1.5.22 jtbs and fixup installed libtool binary with tools prefix.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 24 Oct 2008 20:16:19 +0200 |
| parents | 9d2eb9886e3f |
| children | ec767d4bb97e |
| files | gub/specs/libtool.py |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/libtool.py Fri Oct 24 20:15:17 2008 +0200 +++ b/gub/specs/libtool.py Fri Oct 24 20:16:19 2008 +0200 @@ -19,8 +19,8 @@ ''' class Libtool (targetbuild.TargetBuild): - #source = 'ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.22.tar.gz' - source = 'ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.26.tar.gz' + source = 'ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.22.tar.gz' + #source = 'ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.26.tar.gz' #source = 'ftp://ftp.gnu.org/pub/gnu/libtool/libtool-2.2.6a.tar.gz' def __init__ (self, settings, source): targetbuild.TargetBuild.__init__ (self, settings, source) @@ -71,6 +71,13 @@ Libtool.set_sover (self) def configure (self): build.UnixBuild.configure (self) + def install (self): + toolsbuild.ToolsBuild.install (self) + # FIXME: urg. Are we doing something wrong? Why does libtool + # ignore [have /usr prevail over] --prefix ? + self.file_sub ([(' (/usr/lib/*[" ])', r' %(system_prefix)s/lib \1'), + ('((-L| )/usr/lib/../lib/* )', r'\2%(system_prefix)s/lib \1')], + '%(install_root)s/%(system_prefix)s/bin/libtool') def wrap_executables (self): # The libtool script calls the cross compilers, and moreover, # it is copied. Two reasons why it cannot be wrapped.