[PATCH] gbuildification of rhino

David Ostrovsky david.ostrovsky at gmx.de
Wed Oct 3 02:37:17 PDT 2012


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 [...]

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

With that fix in place, we could just remove
$(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2))
from UnpackedTarball_rhino.mk

Regards
David


More information about the LibreOffice mailing list