Re: [Libreoffice] [PATCH] build system patches
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 > wrote: > > > On 09/07/2011 03:14 AM, Norbert Thiebaud wrote: > > > > > > > > On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley > 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@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. PeterFrom 60694dd3e47402326bf53aa1d0573f898a64ec4d Mon Sep 17 00:00:00 2001 From: Peter Foley 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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Wed, Sep 07, 2011 at 07:21:42AM +0200, Lionel Elie Mamane wrote:
> On Tue, Sep 06, 2011 at 07:27:38PM -0500, Norbert Thiebaud wrote:
>> On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley wrote:
>>> Here are some patches for various problems I encountered while
>>> building libreoffice.
>>>From 913ba23fd2552436c7c48e83fd1d6ec7de6c2e96 Mon Sep 17 00:00:00 2001
>>>From: Peter Foley
>>>Date: Mon, 5 Sep 2011 21:39:22 -0400
>>>Subject: [PATCH 2/7] /usr/local/lib
>>>If /usr/local/lib doesn't exist the Mozilla build fails.
>>>This patch fixes the build failure.
>> Is that an observed behavior or a speculated one ?
> I get the same problem (or a very similar one), and reported it as fdo
> bug #39852.
>> I mean:
>> 1/ why on earth would our build ever try to create or even install
>> something in /usr/loca/bin when building an external lib. if we do,
>> then the fix is to stop that madness, not encourage it :-)
> More precisely, it tries to create ${LIBDIR}; by default, that is
> /usr/local/lib, but if one passed --prefix and/org --libdir to
> autogen.sh, then it is another directory.
Why the library files are declared in the Makefile.in to depend on
LIBDIR, I have not idea, since they are build locally, not in
LIBDIR. I disabled that (commit
34a3046698890676d492d46dfb628d51eb823395) and works for me. Let's see
if it breaks something else :)
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On 09/07/2011 10:28 AM, Norbert Thiebaud wrote: On Wed, Sep 7, 2011 at 1:47 AM, Stephan Bergmann wrote: On 09/07/2011 03:14 AM, Norbert Thiebaud wrote: On Tue, Sep 6, 2011 at 5:32 PM, Peter Foleywrote: 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=291b85778669b4e4e276faab22add9d0e80046df ? 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@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Wed, Sep 7, 2011 at 1:47 AM, Stephan Bergmann wrote: > On 09/07/2011 03:14 AM, Norbert Thiebaud wrote: >> >> On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley 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=291b85778669b4e4e276faab22add9d0e80046df >> ? > > 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 :-) ) I do not build mozila on my tinderox, so I did not see them poping-up at the time :-( Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On 09/07/2011 03:14 AM, Norbert Thiebaud wrote: On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley 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=291b85778669b4e4e276faab22add9d0e80046df ? 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.) -Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Tue, Sep 06, 2011 at 07:27:38PM -0500, Norbert Thiebaud wrote:
> On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley wrote:
>> Here are some patches for various problems I encountered while
>> building libreoffice.
>>From 913ba23fd2552436c7c48e83fd1d6ec7de6c2e96 Mon Sep 17 00:00:00 2001
>>From: Peter Foley
>>Date: Mon, 5 Sep 2011 21:39:22 -0400
>>Subject: [PATCH 2/7] /usr/local/lib
>>If /usr/local/lib doesn't exist the Mozilla build fails.
>>This patch fixes the build failure.
> Is that an observed behavior or a speculated one ?
I get the same problem (or a very similar one), and reported it as fdo
bug #39852.
I've been working around it with:
source Host.Env.sh
unset LIBDIR
cd moz
build
> I mean:
> 1/ why on earth would our build ever try to create or even install
> something in /usr/loca/bin when building an external lib. if we do,
> then the fix is to stop that madness, not encourage it :-)
More precisely, it tries to create ${LIBDIR}; by default, that is
/usr/local/lib, but if one passed --prefix and/org --libdir to
autogen.sh, then it is another directory.
Since my workaround works, my guess is that the moz build system
contains something to the effect of
LIBDIR ?= /something/internal/to/the/moz/build/tree
or
ifndef LIBDIR
LIBDIR = /something/internal/to/the/moz/build/tree
endif
and so the LIBDIR from the LO build system interferes with that.
Or maybe if LIBDIR is not set, it just silently does not try to create
it.
> 2/ if /usr/local/bin does not exist mkdir -p is not going to succeed
> anymore than $(MKDIR), unless you run make as root or have g+w or o+w
> authorization on /usr, both of which are a really, really bad idea.
>From the error message I get (see the bugzilla), the $(MKDIR) variable
is not set...
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley wrote: > Hi, > > Here are some patches for various problems I encountered while building > libreoffice. BTW, can you make a statement to the list about your patches being MPL 1.1/LGPLV3+ ? or point me to the appropriate post if you've already done so and even better reference that post here: http://wiki.documentfoundation.org/Development/Developers (there are few 'license' links there for example of what I mean by license statement... ) Thanks Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley 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=291b85778669b4e4e276faab22add9d0e80046df ? (I'm trying to figure out why this problem shows up all the sudden.. ) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Tue, 6 Sep 2011, Norbert Thiebaud wrote: > On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley wrote: > > Hi, > > > > Here are some patches for various problems I encountered while building > > libreoffice. > > > > 0002... > > >From 913ba23fd2552436c7c48e83fd1d6ec7de6c2e96 Mon Sep 17 00:00:00 2001 > >From: Peter Foley > >Date: Mon, 5 Sep 2011 21:39:22 -0400 > >Subject: [PATCH 2/7] /usr/local/lib > > > >If /usr/local/lib doesn't exist the Mozilla build fails. > >This patch fixes the build failure. > > Is that an observed behavior or a speculated one ? Observed. I've atached the relevent logfile. > > I mean: > 1/ why on earth would our build ever try to create or even install > something in /usr/loca/bin when building an external lib. if we do, > then the fix is to stop that madness, not encourage it :-) Yeah, I'll try to come up with a better fix then this admittedly somewhat hacky one. > 2/ if /usr/local/bin does not exist mkdir -p is not going to succeed > anymore than $(MKDIR), unless you run make as root or have g+w or o+w > authorization on /usr, both of which are a really, really bad idea. I'm actually building libreoffice in a chroot but I agree that a better fix is probably necessary. Feel free to drop this patch for now and I'll try to come up with a better solution. Thanks, Peter mozlog Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] build system patches
On Tue, Sep 6, 2011 at 5:32 PM, Peter Foley wrote: > Hi, > > Here are some patches for various problems I encountered while building > libreoffice. > 0002... >From 913ba23fd2552436c7c48e83fd1d6ec7de6c2e96 Mon Sep 17 00:00:00 2001 >From: Peter Foley >Date: Mon, 5 Sep 2011 21:39:22 -0400 >Subject: [PATCH 2/7] /usr/local/lib > >If /usr/local/lib doesn't exist the Mozilla build fails. >This patch fixes the build failure. Is that an observed behavior or a speculated one ? I mean: 1/ why on earth would our build ever try to create or even install something in /usr/loca/bin when building an external lib. if we do, then the fix is to stop that madness, not encourage it :-) 2/ if /usr/local/bin does not exist mkdir -p is not going to succeed anymore than $(MKDIR), unless you run make as root or have g+w or o+w authorization on /usr, both of which are a really, really bad idea. Norbert --- moz/seamonkey-source-1.1.14.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch index db62e8b..07d8500 100644 --- a/moz/seamonkey-source-1.1.14.patch +++ b/moz/seamonkey-source-1.1.14.patch @@ -6352,3 +6352,14 @@ +PROCESS_MAP_FILE = grep -v ';-' $< | \ +sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ + +--- misc/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in 2011-09-05 19:36:54.506893237 -0400 misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in 2011-09-05 19:37:12.267893237 -0400 +@@ -82,7 +82,7 @@ + export::$(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLBER) + + $(LIBDIR): +- $(MKDIR) $(LIBDIR) ++ mkdir -p $(LIBDIR) + + $(LIBLBER): $(OBJS) $(LIBDIR) + @echo === making $(LIBLBER) -- 1.7.6.1 > Thanks, > > Peter > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] build system patches
Hi,
Here are some patches for various problems I encountered while building
libreoffice.
Thanks,
PeterFrom 35e4d0715604a6337ddf36db5562af96bfdfc61c Mon Sep 17 00:00:00 2001
From: Peter Foley
Date: Mon, 5 Sep 2011 21:38:47 -0400
Subject: [PATCH 1/7 ] deliver libcrmf.a
Mozilla needs libcrmf.a to build.
This patch causes it to be delivered.
---
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
From 913ba23fd2552436c7c48e83fd1d6ec7de6c2e96 Mon Sep 17 00:00:00 2001
From: Peter Foley
Date: Mon, 5 Sep 2011 21:39:22 -0400
Subject: [PATCH 2/7] /usr/local/lib
If /usr/local/lib doesn't exist the Mozilla build fails.
This patch fixes the build failure.
---
moz/seamonkey-source-1.1.14.patch | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/moz/seamonkey-source-1.1.14.patch
b/moz/seamonkey-source-1.1.14.patch
index db62e8b..07d8500 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -6352,3 +6352,14 @@
+PROCESS_MAP_FILE = grep -v ';-' $< | \
+sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in
2011-09-05 19:36:54.506893237 -0400
misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in
2011-09-05 19:37:12.267893237 -0400
+@@ -82,7 +82,7 @@
+ export::$(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLBER)
+
+ $(LIBDIR):
+- $(MKDIR) $(LIBDIR)
++ mkdir -p $(LIBDIR)
+
+ $(LIBLBER): $(OBJS) $(LIBDIR)
+ @echo === making $(LIBLBER)
--
1.7.6.1
From 2448a917e5c31b8ef11f8fe3f1e022a7188475e9 Mon Sep 17 00:00:00 2001
From: Peter Foley
Date: Tue, 6 Sep 2011 17:00:33 -0400
Subject: [PATCH 3/7] clean visibility.cxx
The visibility configure test failed to clean up visibility.cxx.
This patch fixes that.
---
.gitignore |1 -
configure.in |2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 58f491f..8afcf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@
/Makefile
/makefile.mk
/set_soenv
-/visibility.cxx
/post_download
/bin/repo-list
/src.downloaded
diff --git a/configure.in b/configure.in
index f2c3cba..638a9bb 100755
--- a/configure.in
+++ b/configure.in
@@ -3572,7 +3572,7 @@ _ACEOF
;;
esac
fi
-rm -f visibility.s
+rm -f visibility.s visibility.cxx
AC_MSG_RESULT([$gccvisbroken])
if test "$gccvisbroken" = "yes"; then
--
1.7.6.1
From 2e1358b677ed79005502f3b567c993b380b59ecf Mon Sep 17 00:00:00 2001
From: Peter Foley
Date: Tue, 6 Sep 2011 17:31:22 -0400
Subject: [PATCH 4/7] ooo.lst
This patch moves the generation of ooo.lst to prevent generating config.status
twice. This uncovered a implicit dependency on the config.status code which
necesitated the addition of $prefix setting code to prevent $PREFIXDIR from
being "NONE".
---
configure.in |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.in b/configure.in
index 638a9bb..57bb3d9 100755
--- a/configure.in
+++ b/configure.in
@@ -5579,8 +5579,6 @@ fi
AC_SUBST(WITH_LDAP)
AC_SUBST(WITH_OPENLDAP)
-AC_OUTPUT([ooo.lst])
-
dnl ===
dnl Check for system mozilla
dnl ===
@@ -5784,7 +5782,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
MOZILLA_VERSION=1.1.14
fi
MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
+MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst.in`
AC_MSG_CHECKING([for Mozilla sources])
if test -z "$MOZILLA_FETCH_FILE"; then
AC_MSG_RESULT([not found])
@@ -9109,6 +9107,8 @@ AC_MSG_RESULT([$PRODUCTNAME])
AC_SUBST(PRODUCTNAME)
AC_MSG_CHECKING([for prefix])
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
PREFIXDIR="$prefix"
AC_MSG_RESULT(
