Mercurial > gub

changeset 5782:169a4ff622f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lilypond-ancient: Add rpath and -L/cross-ancient/lib thinko.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 13 Oct 2009 22:15:15 +0200
parents be607c132aa0
children 8d801da24983
files gub/specs/lilypond-ancient.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/lilypond-ancient.py	Tue Oct 13 22:17:13 2009 +0200
+++ b/gub/specs/lilypond-ancient.py	Tue Oct 13 22:15:15 2009 +0200
@@ -20,12 +20,15 @@
 #                         + '''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 '''
-                         + '''LDFLAGS='-L%(cross_dir)s-ancient/lib -L%(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)
     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']})
+    def rpath (self):
+        return (r'-Wl,-rpath -Wl,\$$ORIGIN/..%(cross_dir)s/lib -Wl,-rpath -Wl,%(system_prefix)s%(cross_dir)s/lib'
+                + lilypond.LilyPond__simple.rpath (self))
     def LD_PRELOAD (self):
         return ''
     def patch (self):