Thu Feb 1 23:01:19 2018 UTC ()
mysql56-client: Disable compiler detection on SunOS.


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

--- pkgsrc/databases/mysql56-client/Makefile.common 2018/01/16 16:27:12 1.44
+++ pkgsrc/databases/mysql56-client/Makefile.common 2018/02/01 23:01:19 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.44 2018/01/16 16:27:12 adam Exp $ 1# $NetBSD: Makefile.common,v 1.45 2018/02/01 23:01:19 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.39 6DISTNAME= mysql-5.6.39
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= https://www.mysql.com/ 11HOMEPAGE= https://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
@@ -75,26 +75,28 @@ CFLAGS+= -march=i486 @@ -75,26 +75,28 @@ CFLAGS+= -march=i486
75.if !empty(ABI) 75.if !empty(ABI)
76CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" 76CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}"
77.endif 77.endif
78 78
79CPPFLAGS+= -Dunix 79CPPFLAGS+= -Dunix
80CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 80CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
81CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 81CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
82 82
83.if ${OPSYS} != "Interix" 83.if ${OPSYS} != "Interix"
84CFLAGS+= -fPIC -DPIC 84CFLAGS+= -fPIC -DPIC
85CXXFLAGS+= -fPIC -DPIC 85CXXFLAGS+= -fPIC -DPIC
86.endif 86.endif
87 87
 88CMAKE_ARGS.SunOS+= -DFORCE_UNSUPPORTED_COMPILER=YES
 89
88# 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
89# and does not properly detect this, breaking the build later on. Also 91# and does not properly detect this, breaking the build later on. Also
90# explicitly disable epoll support as it is Linux-specific. 92# explicitly disable epoll support as it is Linux-specific.
91CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO 93CMAKE_ARGS.SunOS+= -DHAVE_SYS_EPOLL_H=NO
92CFLAGS.SunOS+= -DHAVE_CURSES_H 94CFLAGS.SunOS+= -DHAVE_CURSES_H
93CXXFLAGS.SunOS+= -DHAVE_CURSES_H 95CXXFLAGS.SunOS+= -DHAVE_CURSES_H
94 96
95.include "../../mk/pthread.buildlink3.mk" 97.include "../../mk/pthread.buildlink3.mk"
96 98
97.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 99.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
98CFLAGS+= -DSIGNALS_DONT_BREAK_READ 100CFLAGS+= -DSIGNALS_DONT_BREAK_READ
99CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 101CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
100.endif 102.endif