Re: x11-link epoxy netbsd-8

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Sat, Nov 02, 2019 at 11:25:50PM +0100, Manuel Bouyer wrote:
> Hello,
> xentools411 did build fine in pkgsrc-2019Q2 on netbsd-8 but fails in
> pkgsrc-2019Q3. xentools411 itself didn't change.
> The failure is:
> http://nyftp.netbsd.org/pub/pkgsrc/packages/reports/2019Q3/NetBSD-8.0-x86_64/20191027.0427/xentools411-4.11.2/build.log
> In file included from /work/sysutils/xentools411/work/.buildlink/include/epoxy/egl.h:46:0,
>                  from /work/sysutils/xentools411/work/xen-4.11.2/tools/qemu-xen/include/ui/egl-helpers.h:5,
>                  from /work/sysutils/xentools411/work/xen-4.11.2/tools/qemu-xen/include/ui/egl-context.h:5,
>                  from /work/sysutils/xentools411/work/xen-4.11.2/tools/qemu-xen/ui/egl-context.c:3:
> /work/sysutils/xentools411/work/.buildlink/include/epoxy/egl_generated.h:10:29: fatal error: EGL/eglplatform.h: No such file or directory
> compilation terminated.
> gmake: *** [/work/sysutils/xentools411/work/xen-4.11.2/tools/qemu-xen/rules.mak:66: ui/egl-context.o] Error 1
> 
> epoxy/egl_generated.h comes from x11-links, and in pkgsrc-2019Q2 x11-links
> didn't provide /usr/X11R7/include/epoxy's content. On netbsd-8 there is no
> /usr/X11R7/include/EGL/
> 
> indeed just removing:
> rm -rf /usr/pkg/share/x11-links/include/epoxy /usr/pkg/share/x11-links/lib/pkgconfig/epoxy.pc
> 
> is enough to make xentools411 build again.
> 
> should x11-links be changed to not include the native epoxy on netbsd-8 ?

The attached patch does this, and fixes the problem for me.
Is it the right way to do it ? If not, how should the problem be solved ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/Makefile,v
retrieving revision 1.202
diff -u -r1.202 Makefile
--- Makefile	25 Nov 2019 09:50:55 -0000	1.202
+++ Makefile	16 Dec 2019 13:40:47 -0000
@@ -4,7 +4,7 @@
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-PKGNAME=	x11-links-1.31
+PKGNAME=	x11-links-1.32
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
Index: xorg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/xorg.mk,v
retrieving revision 1.39
diff -u -r1.39 xorg.mk
--- xorg.mk	25 Nov 2019 09:50:55 -0000	1.39
+++ xorg.mk	16 Dec 2019 13:40:47 -0000
@@ -9,7 +9,9 @@
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[01234678].*)
 .include "../../graphics/libepoxy/buildlink3.mk"
+.endif
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../multimedia/libvdpau/buildlink3.mk"