CVS commit: [pkgsrc-2017Q1] pkgsrc/x11/modular-xorg-server

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Apr 16 14:58:26 UTC 2017

Modified Files:
        pkgsrc/x11/modular-xorg-server [pkgsrc-2017Q1]: Makefile.common

Log Message:
Pullup ticket #5266 - requested by sevan
x11/modular-xorg-server: build fix

Revisions pulled up:
- x11/modular-xorg-server/Makefile.common                       1.17

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Mon Apr 10 13:10:19 UTC 2017

   Modified Files:
           pkgsrc/x11/modular-xorg-server: Makefile.common

   Log Message:
   Avoid picking up epoll on illumos.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/x11/modular-xorg-server/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.16 pkgsrc/x11/modular-xorg-server/Makefile.common:1.16.2.1
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.16 Thu Mar 16 11:56:46 2017
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Sun Apr 16 14:58:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2017/03/16 11:56:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16.2.1 2017/04/16 14:58:26 bsiegert Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
@@ -99,6 +99,9 @@ PLIST.sparc=          yes
 # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
 CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no
 
+# Avoid picking up epoll on illumos
+CONFIGURE_ENV.SunOS+=  ac_cv_func_epoll_create1=no
+
 INSTALLATION_DIRS+=    lib/xorg/modules/drivers lib/xorg/modules/input
 
 BUILDLINK_API_DEPENDS.MesaLib+=                MesaLib>=7.8.0