You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Pedro Giffuni <pf...@apache.org> on 2015/09/24 18:01:04 UTC
Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Hi Andrea;
It did catch me somewhat off-guard that the release is not branched from
trunk. It basically means that some changes that have been in the tree
for over a year won't be included into the next release.
I don't really want to spend time merging changes to the 410 branch, but
I will be merging the basic build fixes for FreeBSD/clang.
I am still determining exactly what should be merged but it will
only affect FreeBSD build (bridges and makefiles) and are made to
diminish the maintenance costs for downstream FreeBSD (Hi Don!).
Pedro.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Andrea Pescetti <pe...@apache.org>.
Pedro Giffuni wrote:
> People shouldn't volunteer other people unless tey are also giving them
> the means to contribute ... I think.
Status of that item (buildbots) is "Done". Don's name is there for
recognition of the already done work.
Using the buildbots for the release (even not considering that we are
not providing binaries for FreeBSD at the moment) will likely become a
TODO for 4.2.0 rather than 4.1.2. For 4.1.2 it makes sense to reuse the
same committers' hardware what we used for 4.1.1. So no further work on
the buildbots (besides fixing some bugs reported by Kay and others) is
needed for 4.1.2.
> I will draw a list and be back.
The issue at https://bz.apache.org/ooo/show_bug.cgi?id=126553 now has a
proposed commits list by Don and I know you know what to do...
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Pedro Giffuni <pf...@apache.org>.
On 09/24/15 11:56, Don Lewis wrote:
> On 24 Sep, Pedro Giffuni wrote:
>> Hi Andrea;
>>
>> It did catch me somewhat off-guard that the release is not branched from
>> trunk. It basically means that some changes that have been in the tree
>> for over a year won't be included into the next release.
>>
>> I don't really want to spend time merging changes to the 410 branch, but
>> I will be merging the basic build fixes for FreeBSD/clang.
>>
>> I am still determining exactly what should be merged but it will
>> only affect FreeBSD build (bridges and makefiles) and are made to
>> diminish the maintenance costs for downstream FreeBSD (Hi Don!).
>
> I've been meaning to bring up this subject since my name is mentioned in
> the Buildbots category here:
> https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2
>
Hmm ... Don has been helping a lot but he is not (yet?) a committer.
People shouldn't volunteer other people unless tey are also giving them
the means to contribute ... I think.
> I am able to build a version of the FreeBSD port fromt the AOO410
> branch, but it requires a fairly extensive set of patches.
>
It is a bunch of patches indeed but since I committed them in a rather
organized way it should not be difficult to merge them.
I will draw a list and be back.
Pedro.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Andrea Pescetti <pe...@apache.org>.
On 25/09/2015 Pedro Giffuni wrote:
> I think it may be desireable to upgrade coinmp in AOO410 and with that
> we would solve the issues for people(/buildbots) doing complete builds.
I see you have just committed this to AOO410, but remember: we are not
freely committing to AOO410 at the moment (even though it seems indeed
desirable to upgrade CoinMP, so it was correct that you did so).
Can you please provide explanations of the different merges from
http://svn.apache.org/viewvc?view=revision&revision=1705549 ?
Especially I don't find any background for this one:
http://svn.apache.org/viewvc?view=revision&revision=1647713
Make sure system LAPACK/BLAS are never used
(the rest seems OK).
> OTOH, my instinct tells me we could just avoid risks and leave things
> as they are right now.
Yes, that's also my instinct and my preference. We got a large number of
fixes in during the last few days, and now let's take the time to check
that things work, and be careful before committing to AOO410.
> Andrea, is the FreeBSD buildbot going to be
> re-targeting AOO410 too?
It depends on its configuration. I assume it follows trunk. What I will
do (when ready) is to move the SNAPSHOT tag to track a recent AOO410
commit. Buildbots that track SNAPSHOT will thus immediately switch to
AOO410.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Pedro Giffuni <pf...@apache.org>.
Hello;
On 09/25/15 12:35, Don Lewis wrote:
> Using the FreeBSD ports framework, I am able to successfully build
> AOO410 branch revision r1705179 on FreeBSD 9.3, 10.1, and 11.0-CURRENT,
> on both i386 and amd64. The only required patch is a tweak to the
> optimization flags to avoid a bug in clang 3.6 on i386. I use exactly
> the same patch when building trunk. Unfortunately this can't be easily
> fixed in the source because $(CCNUMVER) isn't available in gbuild.
>
> If I merge r1690992, r1701276, and r1701344, I can successfully do a
> buildbot-style build on FreeBSD 10.1 if I install the coinmp package and
> pass --with-system-coinmp to configure. The set of merges to fix the
> coinmp build on FreeBSD are not directly mergeable because trunk is
> using CoinMP 1.7.6, but AOO410 is still using 1.6.0. Even if I manually
> fix the problem originally encountered in the trunk build, I run into
> other build failures.
>
I think it may be desireable to upgrade coinmp in AOO410 and with that
we would solve the issues for people(/buildbots) doing complete builds.
OTOH, my instinct tells me we could just avoid risks and leave things
as they are right now. Andrea, is the FreeBSD buildbot going to be
re-targeting AOO410 too?
Pedro.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build
system upgrades)
Posted by Don Lewis <tr...@FreeBSD.org>.
Using the FreeBSD ports framework, I am able to successfully build
AOO410 branch revision r1705179 on FreeBSD 9.3, 10.1, and 11.0-CURRENT,
on both i386 and amd64. The only required patch is a tweak to the
optimization flags to avoid a bug in clang 3.6 on i386. I use exactly
the same patch when building trunk. Unfortunately this can't be easily
fixed in the source because $(CCNUMVER) isn't available in gbuild.
If I merge r1690992, r1701276, and r1701344, I can successfully do a
buildbot-style build on FreeBSD 10.1 if I install the coinmp package and
pass --with-system-coinmp to configure. The set of merges to fix the
coinmp build on FreeBSD are not directly mergeable because trunk is
using CoinMP 1.7.6, but AOO410 is still using 1.6.0. Even if I manually
fix the problem originally encountered in the trunk build, I run into
other build failures.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Pedro Giffuni <pf...@apache.org>.
OK this is my list:
r1591501, r1602791, r1669457, r1669459, r1669465, r1694132
It only touches FreeBSD related build issues:
M main
M main/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx
M main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
M main/bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
M main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
M main/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx
M main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
M main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
M main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk
M main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
M main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
M main/configure.in
M main/graphite/makefile.mk
M main/set_soenv.in
M main/solenv/gbuild/platform/freebsd.mk
M main/solenv/inc/tg_compv.mk
M main/solenv/inc/unx.mk
M main/solenv/inc/unxfbsd.mk
M main/testtools/source/bridgetest/bridgetest.cxx
M main/testtools/source/bridgetest/makefile.mk
I avoided playing with nss and jpeg and I don't really address the
buildbot issues as that is more work.
Pedro.
On 09/24/15 11:56, Don Lewis wrote:
> On 24 Sep, Pedro Giffuni wrote:
>> Hi Andrea;
>>
>> It did catch me somewhat off-guard that the release is not branched from
>> trunk. It basically means that some changes that have been in the tree
>> for over a year won't be included into the next release.
>>
>> I don't really want to spend time merging changes to the 410 branch, but
>> I will be merging the basic build fixes for FreeBSD/clang.
>>
>> I am still determining exactly what should be merged but it will
>> only affect FreeBSD build (bridges and makefiles) and are made to
>> diminish the maintenance costs for downstream FreeBSD (Hi Don!).
>
> I've been meaning to bring up this subject since my name is mentioned in
> the Buildbots category here:
> https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2
>
> I am able to build a version of the FreeBSD port fromt the AOO410
> branch, but it requires a fairly extensive set of patches.
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build
system upgrades)
Posted by Don Lewis <tr...@FreeBSD.org>.
On 24 Sep, Pedro Giffuni wrote:
> Hi Andrea;
>
> It did catch me somewhat off-guard that the release is not branched from
> trunk. It basically means that some changes that have been in the tree
> for over a year won't be included into the next release.
>
> I don't really want to spend time merging changes to the 410 branch, but
> I will be merging the basic build fixes for FreeBSD/clang.
>
> I am still determining exactly what should be merged but it will
> only affect FreeBSD build (bridges and makefiles) and are made to
> diminish the maintenance costs for downstream FreeBSD (Hi Don!).
I've been meaning to bring up this subject since my name is mentioned in
the Buildbots category here:
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2
I am able to build a version of the FreeBSD port fromt the AOO410
branch, but it requires a fairly extensive set of patches.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org
Re: Merging some FreeBSD changes to AOO410 (was Re: AOO build system
upgrades)
Posted by Andrea Pescetti <pe...@apache.org>.
Pedro Giffuni wrote:
> It did catch me somewhat off-guard that the release is not branched from
> trunk. It basically means that some changes that have been in the tree
> for over a year won't be included into the next release.
Yes, this is actually quite normal (well, let's say "usual"!): I mean,
4.1.1 was also released from the AOO410 branch and missed some of the
updates that had been done in trunk in the meantime.
> I don't really want to spend time merging changes to the 410 branch, but
> I will be merging the basic build fixes for FreeBSD/clang.
Commits to the AOO410 branch are required (a social enforcement, not a
technical one) to be approved as release blockers.
I know you are allergic to Bugzilla, so I've opened and approved
https://bz.apache.org/ooo/show_bug.cgi?id=126553
and please include "#i126553#" in your commit logs to track what is
included; and of course, please tell us when we can consider your merges
to be complete.
Remember: we are already freezing AOO410, so your changes should go in
quite soon; I plan to merge my pending changes by this weekend.
Regards,
Andrea.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org