Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
Hi Norbert, Hi Stephan, On Mon, 19 Sep 2011 18:14:22 -0500 Norbert Thiebaud nthieb...@gmail.com wrote: so 3.4 may have accidentally worked because nothing that produce delivered Executable was gbuildified... but at least it was 'working'... with that patch alone I'm afraid 3.4 may not build anymore on MacOSX... please accept my most honest mea cupla. As discussed on IRC, I am not revertting right now, but the rest of the fixes need to be cherrypicked to 3.4 too. Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Tue, 20 Sep 2011 00:10:29 -0500 Norbert Thiebaud nthieb...@gmail.com wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=ff1c626fa1380c7af5a135f80b45de7e62025eed That one got reverted on master and is replaced by: http://cgit.freedesktop.org/libreoffice/core/commit/?id=17a2dcabe15f24567b5b68f92ede6cb19a62405c plus the 3-4 the relevant parts of: http://cgit.freedesktop.org/libreoffice/core/commit/?id=37bf43f4907bd6ce96c732f192a92ebcbc78c95a http://cgit.freedesktop.org/libreoffice/core/commit/?id=2c00d735d2859ca777f3d75e80f1737c6567421f The alternative would be to just revert my unfortunate commit. Could you report back which you prefer? If you want to revert go ahead you have my sign-off. If you want to cherrypick, please test and I will signoff the cherry-picked commit. As there is quite a bit of meddling involved, I would indeed prefer just a revert by now. Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Tue, 20 Sep 2011 20:32:57 +0200 Bjoern Michaelsen bjoern.michael...@canonical.com wrote: As there is quite a bit of meddling involved, I would indeed prefer just a revert by now. As discussed on IRC: http://cgit.freedesktop.org/libreoffice/bootstrap/commit/?h=libreoffice-3-4id=b6b7eb97b48937132638aeeef18270624201a930 Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
Björn,
What good is that backport to 3.4? For one, the fix turns out to not
work yet (as executables already built using gbuild but only used during
the build itself use a NONEBIN token in solenv/gbuild/platform/*.mk
instead of the NONE token used in solenv/inc/*.mk, so that
macosx-change-install-names.pl complains and fails). For another, are
there any executables in 3.4 that are built using gbuild but are not
only used during the build itself (i.e., for which the missing call to
macosx-change-install-names.pl actually matters)?
-Stephan
On 09/19/2011 11:06 PM, Bjoern Michaelsen wrote:
solenv/gbuild/platform/macosx.mk |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85
Author: Stephan Bergmannsberg...@redhat.com
Date: Mon Sep 19 21:39:46 2011 +0200
Call macosx-change-install-names on executables in gbuild, too.
Signed-off-by: Bjoern Michaelsenbjoern.michael...@canonical.com
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2def0c9..ff7 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
-o $(1) \
`cat $${DYLIB_FILE}` \
+ $(if $(filter Executable,$(TARGETTYPE)),\
+ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable
$(LAYER) $(1)) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER)
$(1) \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1))) \
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Mon, 19 Sep 2011 23:20:32 +0200 Stephan Bergmann sberg...@redhat.com wrote: What good is that backport to 3.4? Well, it is a clearcut regression (the error was introduced between 3.3 and 3.4) and a good fix (even breaking on link is better than breaking at runtime) -- so I automatically backported after review. Other than the needs one signoff-rule, we have little guidelines on what goes on the release branch. Maybe we should be a little more strict. But I guess still no revert needed? Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
On Mon, Sep 19, 2011 at 5:34 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Mon, 19 Sep 2011 23:20:32 +0200 Stephan Bergmann sberg...@redhat.com wrote: What good is that backport to 3.4? Well, it is a clearcut regression (the error was introduced between 3.3 and 3.4) and a good fix (even breaking on link is better than breaking at runtime) -- so I automatically backported after review. Other than the needs one signoff-rule, we have little guidelines on what goes on the release branch. Maybe we should be a little more strict. But I guess still no revert needed? well... not so fast... the patch does not fix everything, just make it blow earlier... first in i18npool where gencoll_rule is not happy because it does not have a LAYER defined for it then illegal combination app/NONEBIN/OOO at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/mkunroll] Error 9 make[1]: *** Waiting for unfinished jobs illegal combination app/NONEBIN/URELIB at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/so_checksum] Error 9 illegal combination app/NONEBIN/OOO at /Volumes/Raid0/core/solenv/bin/macosx-change-install-names.pl line 56, IN line 2. make[1]: *** [/Volumes/Raid0/core/workdir/unxmacxi.pro/LinkTarget/Executable/rscdep] Error 9 dmake: Error code 2, while making 'all' so 3.4 may have accidentally worked because nothing that produce delivered Executable was gbuildified... but at least it was 'working'... with that patch alone I'm afraid 3.4 may not build anymore on MacOSX... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild
actually I get further using http://cgit.freedesktop.org/libreoffice/core/commit/?id=ff1c626fa1380c7af5a135f80b45de7e62025eed which should probably be ported back to 3.4 too if you keep the previous patch in. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
