[PATCH] gbuildification of rhino

David Tardon dtardon at redhat.com
Wed Oct 3 04:23:41 PDT 2012


On Wed, Oct 03, 2012 at 11:37:17AM +0200, David Ostrovsky wrote:
> Hi Norbert,
> On 03.10.2012 01:09, Norbert Thiebaud wrote:
> >David,
> >
> >to answer your question on IRC.
> >
> >yes the default patchlevel for gbuild is 3, because most fo the patch
> >we had are like that...
> really?
> Currently, in dmake build system all patches are applied with patch level 2.
> The wrong default patch level (3) in gbuild UnpackedTarball.mk
> gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
> wasn't show up until rhino gbuildification, because in rhino there are two
> build.xml files in different locations. With wrong patch level 3 the
> wrong build.xml
> was picked up and rejected.
> grep patch in solenv/inc give that:
> tg_ext.mk:    [...] patch $(PATCHFLAGS) -p2 [...]

Yes, but notice from _where_ the patch is applied. In gbuild it is from
the project's unpacked dir, while in dmake it is one level up. Therefore
in gbuild we have to strip one level more.

> To fix that in gbuild would be as easy as:
> gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2

Which would break apache-commons, beanshell and all other modules
converted up to now that have old-style patches in them .-)


More information about the LibreOffice mailing list