On 19 March 2018 at 15:43, Alan Coopersmith <alan.coopersm...@oracle.com> wrote: > On 03/19/18 06:33 AM, Emil Velikov wrote: >> On 15 March 2018 at 18:33, Adam Jackson <a...@redhat.com> wrote: >>> On Wed, 2018-03-14 at 21:48 +0100, Thomas Klausner wrote: >>>> On Wed, Mar 14, 2018 at 01:33:28PM -0700, Alan Coopersmith wrote: >>>>> On 03/14/18 01:01 PM, Thomas Klausner wrote: >>>>>> I see a build failure in xorg-server-1.19.99.901 on NetBSD. >>>>> >>>>> Looks like the same failure I saw on Solaris and sent in a patch >>>>> for to revert the removal of that #ifdef. >>>>> >>>>> https://patchwork.freedesktop.org/patch/207937/ >>>> >>>> This patch works for me, thank you. >>> >>> Sorry for letting this one fall through the cracks. Merged, thanks: >>> >>> remote: I: patch #207937 updated using rev >>> 7fc89251ef5e7363dfbf6d831ed448bbcd8519b8. >>> remote: I: 1 patch(es) updated to state Accepted. >>> To ssh://git.freedesktop.org/git/xorg/xserver >>> edf08bd654..7fc89251ef master -> master >>> >> Another solution is to unconditionally include xf86platformBus.h in >> the modesetting driver. > > Nope, as I mentioned in the thread around the patch I sent, that's not > enough as just including the header without restoring the #ifdefs > results in: > > driver.c: In function ‘probe_hw’: > driver.c:246:14: error: implicit declaration of function > ‘xf86_platform_device_odev_attributes’; did you mean > ‘xf86platformAddGPUDevices’? [-Werror=implicit-function-declaration] > fd = xf86_platform_device_odev_attributes(platform_dev)->fd; > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > xf86platformAddGPUDevices > driver.c:246:14: warning: nested extern declaration of > ‘xf86_platform_device_odev_attributes’ [-Wnested-externs] > driver.c:246:64: error: invalid type argument of ‘->’ (have ‘int’) > fd = xf86_platform_device_odev_attributes(platform_dev)->fd; > ^~ > > It looks like you'd need to replace the #ifdef XF86_PDEV_SERVER_FD with > #ifdef XSERVER_PLATFORM_BUS in probe_hw() as well. > Indeed the current varying API (and ABI) based on the configure selected, is rather 'lovely'. Guess, I could pull-up my sleeves and untangle some of that if we have reviewers ;-)
Pardon for the noise. -Emil _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel