Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi Matúš,

this patch should fix the missing key in hash on Macos build [1]:

illegal combination app/SDKBIN/URELIB at /Volumes/TBRAM/core/solenv/bin/macosx-change-install-names.pl 
line 70,<IN>  line 2.


Unfortunatelly I don't have Mac and can not test it ;-(

Could somebody with Mac try to build LO wth idlc converted?
Thanks

David

[1] http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&full-log=1334322010.10061


-------- Original Message --------
Subject: Re: [PUSHED] Re: Re: [PATCH][REVIEW] gbuild conversion: idlc module -- build problems fixed
Date:   Fri, 13 Apr 2012 13:57:55 +0200
From:   David Ostrovsky <david.ostrovsky@gmx.de>
To: Matúš Kukan <matus.kukan@gmail.com>, Libreoffice-dev <libreoffice@lists.freedesktop.org>



Hej Matú?,

you don't have to be scared, just push it ;-)
here is warning fix as a seperate patch.

David

On 13.04.2012 13:39, Matú? Kukan wrote:
 On 13 April 2012 12:56, David Ostrovsky<david.ostrovsky@gmx.de>   wrote:
 Hi,

 Here is the corrected patch.
 I fixed the build error with --enable-werror option enabled.
 Hmm, I would not push it together.
 Warning errors are somehow related to gbuild because there are
 different settings but I would push that separately.
 I pushed one part as
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=99b04ed2be3023bec874fce529d453123f48ac99

 Could you please send another patch for the other issue ?
 Also I don't want to review it, because it scares me :)

 Thanks,
 Matus
 _______________________________________________
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice



From c6f96431ccab619cb7d8fb460dda195dd9b9c2ff Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Fri, 13 Apr 2012 15:50:38 +0200
Subject: [PATCH] gbuild conversion: idlc module fix macos build

---
 solenv/bin/macosx-change-install-names.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 91bea7e..ad0318a 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -53,7 +53,7 @@ sub action($$$)
         ('app/UREBIN/URELIB' => '@executable_path/../lib',
          'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
          'app/OOO/OOO' => '@executable_path',
-         'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
+         'app/SDKBIN/URELIB' => '@executable_path/../../ure-link/lib',
          'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
          'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
-- 
1.7.5.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.