Mercurial > gub
changeset 3396:144d9e4c5e2f
Glibc-core compile fix.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Wed, 02 May 2007 20:55:52 +0200 |
| parents | 47d96728825e |
| children | d307a5c2d431 |
| files | gub/specs/glibc-core.py gub/specs/glibc.py |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/glibc-core.py Wed May 02 20:55:40 2007 +0200 +++ b/gub/specs/glibc-core.py Wed May 02 20:55:52 2007 +0200 @@ -24,7 +24,7 @@ cd %(srcdir)s && patch -p1 < %(patchdir)s/glibc-2.3-core-install.patch ''') def get_add_ons (self): - return '' + return ('linuxthreads',) def configure_command (self): return (glibc.Glibc.configure_command (self) + misc.join_lines ('''
--- a/gub/specs/glibc.py Wed May 02 20:55:40 2007 +0200 +++ b/gub/specs/glibc.py Wed May 02 20:55:52 2007 +0200 @@ -22,16 +22,16 @@ cd %(srcdir)s && patch -p1 < %(patchdir)s/glibc-2.3-powerpc-initfini.patch ''') def get_add_ons (self): + return ('linuxthreads', 'nptl') + def configure_command (self): + #FIXME: TODO, figure out which of --enable-add-ons=nptl, + # --with-tls, --with-__thread fixes the ___tls_get_addr. add_ons = '' - for i in ('linuxthreads', 'nptl'): + for i in self.get_add_ons (): # FIXME cannot expand in *_command () #if os.path.exists (self.expand ('%(srcdir)s/') + i): if 1: #self.version () != '2.4': add_ons += ' --enable-add-ons=' + i - return add_ons - def configure_command (self): - #FIXME: TODO, figure out which of --enable-add-ons=nptl, - # --with-tls, --with-__thread fixes the ___tls_get_addr. return ('BUILD_CC=gcc ' + misc.join_lines (targetpackage.TargetBuildSpec.configure_command (self) + ''' --disable-profile @@ -41,7 +41,7 @@ ''') #--without-tls #--without-__thread - + self.get_add_ons ()) + + add_ons) def FIXME_DOES_NOT_WORK_get_substitution_dict (self, env={}): d = targetpackage.TargetBuildSpec.get_substitution_dict (self, env) d['SHELL'] = '/bin/bash'