changeset 6185:71587882ddc3

{darwin-x86,freebsd-*}::cross/gcc: add rpath to LDFLAGS Fixes "libmpfr.so.1 not found" problem. /home/janneke/vc/gub/target/darwin-x86/build/cross/gcc-4.3.2/./gcc/cc1: error while loading shared libraries: libmpfr.so.1: cannot open shared object file: No such file or directory
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sat, 25 Aug 2012 12:21:41 +0200
parents 6a6aabe5121b
children 50b17646c488
files gub/freebsd.py gub/specs/darwin/cross/gcc.py gub/specs/freebsd/cross/gcc.py
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/freebsd.py	Sat Aug 25 12:10:59 2012 +0200
+++ b/gub/freebsd.py	Sat Aug 25 12:21:41 2012 +0200
@@ -11,7 +11,8 @@
     @context.subst_method
     def rpath (foo):
         return ''
-    package.rpath = misc.MethodOverrider (package.nop, rpath)
+    if not isinstance (package, cross.AutoBuild):
+        package.rpath = misc.MethodOverrider (package.nop, rpath)
 
 # FIXME: download from sane place; or rather download only kernel
 # headers and build full toolchain from source?
--- a/gub/specs/darwin/cross/gcc.py	Sat Aug 25 12:10:59 2012 +0200
+++ b/gub/specs/darwin/cross/gcc.py	Sat Aug 25 12:21:41 2012 +0200
@@ -55,6 +55,8 @@
     source = 'ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.3.2/gcc-4.3.2.tar.bz2'
     patches = ['gcc-4.3.2-no-fixed-includes.patch']
     dependencies = Gcc__darwin.dependencies + ['tools::mpfr']
+    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
+                         + Gcc__darwin.configure_command)
 
 class Version_bump_builds_but_needs_a_test_Gcc__darwin__ppc (Gcc__darwin__x86):
     pass
--- a/gub/specs/freebsd/cross/gcc.py	Sat Aug 25 12:10:59 2012 +0200
+++ b/gub/specs/freebsd/cross/gcc.py	Sat Aug 25 12:21:41 2012 +0200
@@ -4,6 +4,8 @@
 class Gcc__freebsd (cross_gcc.Gcc):
     source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2'
     dependencies = cross_gcc.Gcc.dependencies + ['tools::mpfr']
+    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
+                         + cross_gcc.Gcc.configure_command)
     configure_flags = (cross_gcc.Gcc.configure_flags
                 + misc.join_lines ('''
 --program-prefix=%(toolchain_prefix)s