Mercurial > gub
changeset 5795:6bbcbbf683f4
lilypond-ancient: remove some x86_64 workarounds.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Wed, 14 Oct 2009 13:57:44 +0200 |
| parents | 76b5f6da9a69 |
| children | ccfcbe9e2164 |
| files | gub/specs/lilypond-ancient.py |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/lilypond-ancient.py Wed Oct 14 13:57:12 2009 +0200 +++ b/gub/specs/lilypond-ancient.py Wed Oct 14 13:57:44 2009 +0200 @@ -33,15 +33,19 @@ # + '''LIBS=-lstdc++-3-libc6.3-2-2.10.0 ''' # + '''LDFLAGS='-Wl,-L -Wl,%(system_prefix)s/%(cross_dir)s-ancient/lib -L%(system_prefix)s/lib' ''' # + '''LIBS=-lstdc++-3-libc6.3-2-2.10.0 ''' +#### + '''CFLAGS='-L/lib32 -Wl,-L -Wl,/lib32 -Wa,--32 -Wl,-L -Wl,%(system_root)s/lib' ''' + + '''LIBRARY_PATH=%(system_prefix)s/lib ''' + '''LDFLAGS='-L%(system_prefix)s%(cross_dir)s-ancient/lib -L%(system_prefix)s/lib %(rpath)s' ''' + '''LIBS='-lstdc++ -lgcc -lkpathsea' ''' + lilypond.LilyPond__simple.configure_command) + configure_flags = (lilypond.LilyPond__simple.configure_flags + + ' --cache-file=%(builddir)s/config.cache') destdir_install_broken = True install_flags_destdir_broken = (lilypond.LilyPond__simple.install_flags_destdir_broken .replace ('datadir=', 'xdatadir=')) def __init__ (self, settings, source): lilypond.LilyPond__simple.__init__ (self, settings, source) - build.change_dict (self, {'PATH': '%(cross_prefix)s-ancient/bin:%(tools_prefix)s/bin:%(cross_prefix)s/bin:%(tools_cross_prefix)s/bin:' + os.environ['PATH']}) + build.change_dict (self, {'PATH': '%(cross_prefix)s-ancient/bin:%(tools_prefix)s/bin:%(cross_prefix)s/bin:%(cross_prefix)s/%(target_architecture)s/bin:%(tools_cross_prefix)s/bin:' + os.environ['PATH']}) def rpath (self): return (r'-Wl,-rpath -Wl,\$$ORIGIN/..%(cross_dir)s-ancient/lib -Wl,-rpath -Wl,%(system_prefix)s%(cross_dir)s-ancient/lib ' + lilypond.LilyPond__simple.rpath (self))