[Libreoffice] [PATCH] build system patches

[Peter Foley]

On Wed, 7 Sep 2011, Stephan Bergmann wrote:

> On 09/07/2011 10:28 AM, Norbert Thiebaud wrote:
> > On Wed, Sep 7, 2011 at 1:47 AM, Stephan Bergmann<sbergman at redhat.com>
> wrote:
> > > On 09/07/2011 03:14 AM, Norbert Thiebaud wrote:
> > > >
> > > > On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley<pefoley2 at verizon.net>
> wrote:
> > > > >
> > > > > Hi,
> > > > >
> > > > > Here are some patches for various problems I encountered while
> building
> > > > > libreoffice.
> > > >
> > > > 0001-libcrnf.a
> > > >
> > > > is that a consequence of
> > > >
> > > >
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=291b85778669b4e4e2
> 76faab22add9d0e80046df
> > > > ?
> > >
> > > I would suspect so.  That one apparently also broke my Mac OS X build,
> but I
> > > did not yet find time to look into it.  (What fits somewhat nicely is
> that
> > > it shows up in a chroot build.  My impression from the Mac OS X build
> > > failure logs was that building moz now inadvertently takes certain
> libraries
> > > from the system, instead of from (now) intended to be built in nss vs.
> > > (before) being built as part of building moz itself, and those
> libraries are
> > > not present, on Mac OS X nor in a chroot.  Something like that.)
> >
> > humm.. and that would also explain the 0002- patch (well not the patch
> > but the reason that motivated it)
> > I think you are right, and maybe the commit above should be revisited
> > in light of these... (I means instead of papering over the symptom :-)
> > )
> 
> Yes, definitely dig in and try to understand the root cause, than fixing the
> symptoms.  Putting kendy as the author of the above changeset on cc.
> 
> -Stephan
> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

ping?

I'm still using my libcrmf.a patch (attached) to work around this build 
breakage.

Peter
-------------- next part --------------
From 60694dd3e47402326bf53aa1d0573f898a64ec4d Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2 at verizon.net>
Date: Mon, 5 Sep 2011 21:38:47 -0400
Subject: [PATCH 1/4] libcrmf.a

---
 nss/makefile.mk |    2 +-
 nss/prj/d.lst   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/nss/makefile.mk b/nss/makefile.mk
index aa242bd..75ebb21 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -91,7 +91,7 @@ MACOS_SDK_DIR*=$(MACDEVSDK)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(OS)"=="MACOSX"
 
-OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
+OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) mozilla$/dist$/out$/lib$/libcrmf.a
 
 OUT2BIN=config$/nspr-config mozilla$/security$/nss$/nss-config
 
diff --git a/nss/prj/d.lst b/nss/prj/d.lst
index cc36eb1..a887c36 100644
--- a/nss/prj/d.lst
+++ b/nss/prj/d.lst
@@ -25,6 +25,7 @@ mkdir: %_DEST%\lib\sqlite
 ..\%__SRC%\lib\libsmime3.* %_DEST%\lib\libsmime3.*
 ..\%__SRC%\lib\libsoftokn3.* %_DEST%\lib\libsoftokn3.*
 ..\%__SRC%\lib\libssl3.* %_DEST%\lib\libssl3.*
+..\%__SRC%\lib\libcrmf.a %_DEST%\lib\libcrmf.a
 
 ..\%__SRC%\lib\libsqlite3.* %_DEST%\lib\sqlite\libsqlite3.*
 ..\%__SRC%\lib\*.lib %_DEST%\lib
-- 
1.7.6.1