Bug 146590 – [GTK] Disable gtk-doc and gobject-introspection when crossbuilding

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Emanuele Aina]

Neither gtk-doc nor gobject-introspection really work when cross-building, let's just disable them when cmake says we're cross-compiling.

Note that in the gtk-doc case, at the moment it is not possible to avoid it even by setting ENABLE_GTKDOC=OFF, since even then it is run as a syntax-check: https://trac.webkit.org/browser/trunk/Source/PlatformGTK.cmake#L35

[Emanuele Aina]

Created attachment 256099 [details]
Patch

[Martin Robinson]

Comment on attachment 256099 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=256099&action=review

> Source/cmake/OptionsGTK.cmake:73
> +# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building
> +if (CMAKE_CROSSCOMPILING)
> +    set(ENABLE_GTKDOC OFF)
> +    set(ENABLE_INTROSPECTION OFF)
> +endif ()

Lets move this down to after the USE_LIBHYPHEN check near line 429. It's a bit strange to do this in the middle of the definition of all the options.

[Emanuele Aina]

Created attachment 256105 [details]
Patch

[Emanuele Aina]

> Lets move this down to after the USE_LIBHYPHEN check near line 429. It's a bit strange to do this in the middle of the definition of all the options.

Indeed, I wasn't sure if it was better to keep the override close to the original definition or move it in a more appropriate place.

I've updated the patch and took the liberty of listing you as reviewer in the ChangeLog (is it correct to do so?).

[Martin Robinson]

(In reply to comment #4)
> > Lets move this down to after the USE_LIBHYPHEN check near line 429. It's a bit strange to do this in the middle of the definition of all the options.
> 
> Indeed, I wasn't sure if it was better to keep the override close to the
> original definition or move it in a more appropriate place.
> 
> I've updated the patch and took the liberty of listing you as reviewer in
> the ChangeLog (is it correct to do so?).

It usually isn't necessary. The tools typically fill it in by reading who attaches the r+ in Bugzilla.

[Martin Robinson]

Committed r186259: <http://trac.webkit.org/changeset/186259>

[Martin Robinson]

Thanks for the patch! I took the liberty of landing it.

[Emanuele Aina]

Thanks! :D