summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/cups/Makefile8
-rw-r--r--print/cups15/Makefile8
2 files changed, 10 insertions, 6 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index aa0deb89069..89e7f754131 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -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 @@ CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
.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}
diff --git a/print/cups15/Makefile b/print/cups15/Makefile
index 4c82070c10e..f0db72ab73a 100644
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -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 @@ CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
.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}