Wed Sep 24 10:02:14 2014 UTC ()
Explicitly disable epoll on SunOS, the MySQL implementation is specific
to Linux at this time.


(jperkin)
diff -r1.17 -r1.18 pkgsrc/databases/mysql56-client/Makefile.common
cvs diff -r1.17 -r1.18 pkgsrc/databases/mysql56-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql56-client/Makefile.common 2014/08/10 15:11:57 1.17
+++ pkgsrc/databases/mysql56-client/Makefile.common 2014/09/24 10:02:14 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.17 2014/08/10 15:11:57 adam Exp $ 1# $NetBSD: Makefile.common,v 1.18 2014/09/24 10:02:14 jperkin Exp $
2# 2#
3# used by databases/mysql56-client/Makefile 3# used by databases/mysql56-client/Makefile
4# used by databases/mysql56-server/Makefile 4# used by databases/mysql56-server/Makefile
5 5
6DISTNAME= mysql-5.6.20 6DISTNAME= mysql-5.6.20
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 11HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql56-client/distinfo
@@ -77,29 +77,31 @@ CFLAGS+= -march=i486 @@ -77,29 +77,31 @@ CFLAGS+= -march=i486
77.if !empty(ABI) 77.if !empty(ABI)
78CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 78CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
79.endif 79.endif
80 80
81CPPFLAGS+= -Dunix 81CPPFLAGS+= -Dunix
82CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 82CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
83CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 83CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
84 84
85.if ${OPSYS} != "Interix" 85.if ${OPSYS} != "Interix"
86CFLAGS+= -fPIC -DPIC 86CFLAGS+= -fPIC -DPIC
87CXXFLAGS+= -fPIC -DPIC 87CXXFLAGS+= -fPIC -DPIC
88.endif 88.endif
89 89
90# force HAVE_CURSES_H on Solaris since the configure script is broken 90# Force HAVE_CURSES_H on Solaris since the configure script is broken
91# and does not properly detect this, breaking the build later on. 91# and does not properly detect this, breaking the build later on. Also
 92# explicitly disable epoll support as it is Linux-specific.
92.if ${OPSYS} == "SunOS" 93.if ${OPSYS} == "SunOS"
 94CMAKE_ARGS+= -DHAVE_SYS_EPOLL_H=NO
93CFLAGS+= -DHAVE_CURSES_H 95CFLAGS+= -DHAVE_CURSES_H
94CXXFLAGS+= -DHAVE_CURSES_H 96CXXFLAGS+= -DHAVE_CURSES_H
95.endif 97.endif
96 98
97.include "../../mk/pthread.buildlink3.mk" 99.include "../../mk/pthread.buildlink3.mk"
98 100
99.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 101.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
100CFLAGS+= -DSIGNALS_DONT_BREAK_READ 102CFLAGS+= -DSIGNALS_DONT_BREAK_READ
101CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 103CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
102.endif 104.endif
103 105
104LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 106LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
105 107