lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Re: Building GUB3


From: John Mandereau
Subject: [PATCH] Re: Building GUB3
Date: Wed, 18 Feb 2009 11:41:03 +0100
User-agent: Thunderbird 2.0.0.19 (X11/20090105)

Hi Jan,

Jan Nieuwenhuizen a écrit :
Ah, you reported something like this before... A fixlet for this is in
HEAD (full rebuild ahead).
I needed the attached patch (error log attached too) to succesfully complete "make -f lilypond.make bootstrap".

John
>From ad674166ea290a28a6865d576088fcdcc44ae47f Mon Sep 17 00:00:00 2001
From: John Mandereau <address@hidden>
Date: Wed, 18 Feb 2009 10:54:10 +0100
Subject: [PATCH] Remove more duplicate libiberty.a files generated by binutils 
and gcc

This fix completes a previous similar fix in commit
fdfe393e51f670b97afe945bb920bd5b525e129d
---
 gub/specs/cross/binutils.py        |    2 ++
 gub/specs/darwin/cross/binutils.py |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gub/specs/cross/binutils.py b/gub/specs/cross/binutils.py
index 38a6a82..778cd34 100644
--- a/gub/specs/cross/binutils.py
+++ b/gub/specs/cross/binutils.py
@@ -44,6 +44,8 @@ cd 
%(install_prefix)s%(cross_dir)s/%(target_architecture)s/bin && ln strip gstri
         '''
         self.system ('rm %(install_prefix)s%(cross_dir)s/lib/libiberty.a',
                      ignore_errors=True)
+        self.system ('rm %(install_prefix)s%(cross_dir)s/lib64/libiberty.a',
+                     ignore_errors=True)
 
 class Binutils__linux__ppc (Binutils):
     patches = Binutils.patches + ['binutils-2.18-werror-ppc.patch']
diff --git a/gub/specs/darwin/cross/binutils.py 
b/gub/specs/darwin/cross/binutils.py
index 5b0b3df..717ea4f 100644
--- a/gub/specs/darwin/cross/binutils.py
+++ b/gub/specs/darwin/cross/binutils.py
@@ -13,4 +13,10 @@ class Binutils__darwin (binutils.Binutils):
     #    return (binutils.Binutils._get_build_dependencies (self)
     #            + ['odcctools'])
     def install (self):
+        '''
+        On some systems [Fedora9], libiberty.a is provided by binutils
+        *and* by gcc; see gub/specs/binutils.py for more details.
+        '''
         cross.AutoBuild.install (self)
+        self.system ('rm %(install_prefix)s%(cross_dir)s/lib64/libiberty.a',
+                     ignore_errors=True)
-- 
1.5.6.6

building package: freebsd-x86::cross/gcc
 *** Stage: download (cross/gcc, freebsd-x86)
 *** Stage: untar (cross/gcc, freebsd-x86)
 *** Stage: patch (cross/gcc, freebsd-x86)
 *** Stage: autoupdate (cross/gcc, freebsd-x86)
 *** Stage: configure (cross/gcc, freebsd-x86)
 *** Stage: compile (cross/gcc, freebsd-x86)
 *** Stage: install (cross/gcc, freebsd-x86)
 *** Stage: package (cross/gcc, freebsd-x86)
 *** Stage: clean (cross/gcc, freebsd-x86)
 *** Stage: pkg_install (cross/gcc, freebsd-x86)
already have file ./usr/cross/lib64/libiberty.a: cross/binutils

Tail of target/freebsd-x86/log/build.log >>>>>>>>
meq4U\tgcc-4.3.2q5\x86q6U\x04bitsq7U\x0232q8\x86q9U\x06branchq:U\x00q;\x86q<U\x12build_architectureq=U\x0cx86_64-linuxq>address@hidden/binutils;freebsd-x86::freebsd-runtime;tools::bzip2;tools::librestrict;tools::make;tools::mpfr;tools::tarqG\x86qHU\x13build_hardware_bitsqIhA\x86qJU\x08build_osqKU\x05linuxqL\x86qMU\x0ebuild_platformqNU\x08linux-64qO\x86qPU\x08builddirqQUA/home/lilydev/git/newgub/target/freebsd-x86/build/cross/gcc-4.3.2qR\x86qSU\ncache_fileqTUN/home/lilydev/git/newgub/target/freebsd-x86/build/cross/gcc-4.3.2/config.cacheqU\x86qVU\x08categoryqWh;\x86qXU\rchecksum_fileqYUG/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc.checksumqZ\x86q[U\x0fcompile_commandq\\U\x0bmake
  -j2  
q]\x86q^U\x10configure_binaryq_UI/home/lilydev/git/newgub/target/freebsd-x86/src/cross/gcc-4.3.2/configureq`\x86qaU\x11configure_commandqbT\xd1\x02\x00\x00/home/lilydev/git/newgub/target/freebsd-x86/src/cross/gcc-4.3.2/configure
 
--prefix=/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-root/usr
 --program-prefix=i686-freebsd4- 
--prefix=/home/lilydev/git/newgub/target/freebsd-x86/root/usr/cross 
--target=i686-freebsd4 
--with-sysroot=/home/lilydev/git/newgub/target/freebsd-x86/root 
--disable-multilib  
--with-as=/home/lilydev/git/newgub/target/freebsd-x86/root/usr/cross/bin/i686-freebsd4-as
 
--with-ld=/home/lilydev/git/newgub/target/freebsd-x86/root/usr/cross/bin/i686-freebsd4-ld
 
--with-nm=/home/lilydev/git/newgub/target/freebsd-x86/root/usr/cross/bin/i686-freebsd4-nm
 --enable-static --enable-shared  --enable-languages=c,c++  
--enable-libstdcxx-debug 
qc\x86qdU\x10conflicts_stringqeU\x01;qf\x86qgU\x0bcore_prefixqhU?/home/lilydev/git/newgub/target/freebsd-x86/root/usr/cross/coreqi\x86qjU\x03cpuqkU\x04i686ql\x86qmU\rcpu_count_strqnU\x012qo\x86qpU\x0fcross_allsrcdirqqU5/home/lilydev/git/newgub/target/freebsd-x86/src/crossqr\x86qsU\tcross_dirqtU\x06/crossqu\x86qvU\x0ecross_packagesqwU:/home/lilydev/git/newgub/target/freebsd-x86/packages/crossqx\x86qyU\x0ccross_prefixqzU:/home/lilydev/git/newgub/target/freebsd-x86/root/usr/crossq{\x86q|U\x0fcross_statusdirq}U8/home/lilydev/git/newgub/target/freebsd-x86/status/crossq~\x86q\x7fU\rdebian_branchq\x80U\x06stableq\x81\x86q\x82U\x13dependencies_stringq\x83U\x12;cross/gcc-runtimeq\x84\x86q\x85U\x0bdescriptionq\x86h;\x86q\x87U\tdownloadsq\x88U"/home/lilydev/git/newgub/downloadsq\x89\x86q\x8aU\x08fakerootq\x8bU\x0ffakeroot
 -i -s 
q\x8c\x86q\x8dU\x0efakeroot_cacheq\x8eh;\x86q\x8fU\tfile_nameq\x90U\rgcc-4.3.2.tarq\x91\x86q\x92U\x0cfull_versionq\x93U\x054.3.2q\x94\x86q\x95U\x0bgtk_versionq\x96U\x032.8q\x97\x86q\x98U\x06gubdirq\x99U\x18/home/lilydev/git/newgubq\x9a\x86q\x9bU\x0finstall_commandq\x9cUpmake
  
DESTDIR=/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-root
 prefix=/usr/cross 
installq\x9d\x86q\x9eU\x0einstall_prefixq\x9fUL/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-root/usrq\xa0\x86q\xa1U\x0cinstall_rootq\xa2UH/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-rootq\xa3\x86q\xa4U\ninstalldirq\xa5U3/home/lilydev/git/newgub/target/freebsd-x86/installq\xa6\x86q\xa7U\x06logdirq\xa8U//home/lilydev/git/newgub/target/freebsd-x86/logq\xa9\x86q\xaaU\tmakeflagsq\xabh;\x86q\xacU\x04nameq\xadh
 
\x86q\xaeU\x0cname_versionq\xafU\x0fcross/gcc-4.3.2q\xb0\x86q\xb1U\x16native_compile_commandq\xb2U\nmake
  -j2 
q\xb3\x86q\xb4U\x07nsisdirq\xb5U\x1d/home/lilydev/git/newgub/nsisq\xb6\x86q\xb7U\x02osq\xb8U\x07freebsdq\xb9\x86q\xbaU\x0cpackage_archq\xbbU\x04i386q\xbc\x86q\xbdU\x08packagesq\xbeU4/home/lilydev/git/newgub/target/freebsd-x86/packagesq\xbf\x86q\xc0U\x14packaging_suffix_dirq\xc1h;\x86q\xc2U\x08patchdirq\xc3U
 
/home/lilydev/git/newgub/patchesq\xc4\x86q\xc5U\x08platformq\xc6U\x0bfreebsd-x86q\xc7\x86q\xc8U\x10platform_uploadsq\xc9U,/home/lilydev/git/newgub/uploads/freebsd-x86q\xca\x86q\xcbU\nprefix_dirq\xccU\x04/usrq\xcd\x86q\xceU\x0bpretty_nameq\xcfU\x03Gccq\xd0\x86q\xd1U\x08root_dirq\xd2U\x05/rootq\xd3\x86q\xd4U\x05rpathq\xd5U\x1f-Wl,-rpath
  {}
invoking rm -rf 
/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-root
Running dump_file
  ('package', 
'/home/lilydev/git/newgub/target/freebsd-x86/status/cross/gcc-4.3.2-gcc-4.3.2', 
'w')
  {'permissions': 420}
 *** Stage: clean (cross/gcc, freebsd-x86)
invoking rm -rf  
/home/lilydev/git/newgub/target/freebsd-x86/status/cross/gcc-4.3.2-gcc-4.3.2 
/home/lilydev/git/newgub/target/freebsd-x86/install/cross/gcc-4.3.2-root
invoking rm -rf /home/lilydev/git/newgub/target/freebsd-x86/src/cross/gcc-4.3.2 
/home/lilydev/git/newgub/target/freebsd-x86/build/cross/gcc-4.3.2
 *** Stage: pkg_install (cross/gcc, freebsd-x86)
installing package: cross/gcc-doc
untarring: 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-doc-4.3.2.freebsd-x86.gup
Running read_pipe
  ('tar -t -z -f 
"/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-doc-4.3.2.freebsd-x86.gup"',)
  {}
invoking tar -C /home/lilydev/git/newgub/target/freebsd-x86/root -p -x -z -f 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-doc-4.3.2.freebsd-x86.gup
installing package: cross/gcc-c++-runtime
untarring: 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-c++-runtime-4.3.2.freebsd-x86.gup
Running read_pipe
  ('tar -t -z -f 
"/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-c++-runtime-4.3.2.freebsd-x86.gup"',)
  {}
invoking tar -C /home/lilydev/git/newgub/target/freebsd-x86/root -p -x -z -f 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-c++-runtime-4.3.2.freebsd-x86.gup
installing package: cross/gcc-runtime
untarring: 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-runtime-4.3.2.freebsd-x86.gup
Running read_pipe
  ('tar -t -z -f 
"/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-runtime-4.3.2.freebsd-x86.gup"',)
  {}
invoking tar -C /home/lilydev/git/newgub/target/freebsd-x86/root -p -x -z -f 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-runtime-4.3.2.freebsd-x86.gup
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libgomp.la')
  {'must_succeed': True}
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libsupc++.la')
  {'must_succeed': True}
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libssp_nonshared.la')
  {'must_succeed': True}
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libmudflap.la')
  {'must_succeed': True}
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libssp.la')
  {'must_succeed': True}
Running file_sub
  ([('^libdir=.*', 
"libdir='/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib'")], 
'/home/lilydev/git/newgub/target/freebsd-x86/root/usr/lib/libmudflapth.la')
  {'must_succeed': True}
installing package: cross/gcc
untarring: 
/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-4.3.2.freebsd-x86.gup
Running read_pipe
  ('tar -t -z -f 
"/home/lilydev/git/newgub/target/freebsd-x86/packages/cross/gcc-4.3.2.freebsd-x86.gup"',)
  {}
already have file ./usr/cross/lib64/libiberty.a: cross/binutils

<<<<<<<< Tail of target/freebsd-x86/log/build.log


*** Failed target: freebsd-x86::cross/gcc

Traceback (most recent call last):
  File "bin/gub", line 323, in <module>
    main ()
  File "bin/gub", line 319, in main
    logged_build (settings, options, files)
  File "bin/gub", line 288, in logged_build
    sys.exit (exceptional_build (settings, options, files, logger))
  File "bin/gub", line 267, in exceptional_build
    build (settings, options, files)
  File "bin/gub", line 263, in build
    b.build_source_packages (names)
  File "bin/../gub/buildrunner.py", line 271, in build_source_packages
    self.spec_build (spec_name)
  File "bin/../gub/buildrunner.py", line 229, in spec_build
    self.spec_install (spec)
  File "bin/../gub/buildrunner.py", line 184, in spec_install
    self.pkg_install (spec, pkg)
  File "bin/../gub/buildrunner.py", line 180, in pkg_install
    manager.install_package (install_candidate.name ())
  File "bin/../gub/gup.py", line 318, in install_package
    self.install_tarball (ball, name, d['prefix_dir'])
  File "bin/../gub/gup.py", line 111, in install_tarball
    raise Exception ('abort')
Exception: abort
make: *** [cross-compilers] Erreur 1

reply via email to

[Prev in Thread] Current Thread [Next in Thread]