Thu Apr 23 09:29:22 2015 UTC ()
Explicitly disable epoll on illumos, it is provided for Linux compat only.
(jperkin)
diff -r1.217 -r1.218 pkgsrc/print/cups/Makefile
diff -r1.3 -r1.4 pkgsrc/print/cups15/Makefile
--- pkgsrc/print/cups/Makefile 2015/03/14 21:07:37 1.217
+++ pkgsrc/print/cups/Makefile 2015/04/23 09:29:22 1.218
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.217 2015/03/14 21:07:37 tnn Exp $
+# $NetBSD: Makefile,v 1.218 2015/04/23 09:29:22 jperkin Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -56,8 +56,10 @@
.include "options.mk"
.if ${OPSYS} == "SunOS"
-LIBS_SSP = -lssp_nonshared -lssp
-CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
+LIBS_SSP= -lssp_nonshared -lssp
+CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
+# Explicitly disable epoll on illumos, it is provided for Linux compat only.
+CONFIGURE_ENV+= ac_cv_func_epoll_create=no
.endif
LIBS+= ${BUILDLINK_LDADD.iconv}
--- pkgsrc/print/cups15/Attic/Makefile 2015/03/14 21:03:48 1.3
+++ pkgsrc/print/cups15/Attic/Makefile 2015/04/23 09:29:22 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/03/14 21:03:48 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/23 09:29:22 jperkin Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -68,8 +68,10 @@
.include "options.mk"
.if ${OPSYS} == "SunOS"
-LIBS_SSP = -lssp_nonshared -lssp
-CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
+LIBS_SSP= -lssp_nonshared -lssp
+CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
+# Explicitly disable epoll on illumos, it is provided for Linux compat only.
+CONFIGURE_ENV+= ac_cv_func_epoll_create=no
.endif
LIBS+= ${BUILDLINK_LDADD.iconv}