Thu Aug 17 08:20:28 2023 UTC ()
mariadb*-client: Force HAVE_CURSES_H when using ncurses.
For some reason mariadb removed any cmake detection for HAVE_CURSES_H so it is
never defined, but the source is still littered with it, causing compilation
problems because curses.h never gets included.
The whole thing is incredibly messy, and this is the least likely to
accidentally break some alternate configuration, but implementations that use
curses.h which isn't ncurses are likely to still be broken.
(jperkin)
diff -r1.3 -r1.4 pkgsrc/databases/mariadb1011-client/Makefile.common
diff -r1.17 -r1.18 pkgsrc/databases/mariadb104-client/Makefile.common
diff -r1.23 -r1.24 pkgsrc/databases/mariadb105-client/Makefile.common
diff -r1.19 -r1.20 pkgsrc/databases/mariadb106-client/Makefile.common
--- pkgsrc/databases/mariadb1011-client/Makefile.common 2023/07/23 09:29:51 1.3
+++ pkgsrc/databases/mariadb1011-client/Makefile.common 2023/08/17 08:20:27 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2023/07/23 09:29:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2023/08/17 08:20:27 jperkin Exp $
#
# used by databases/mariadb1011-client/Makefile
# used by databases/mariadb1011-server/Makefile
@@ -90,6 +90,7 @@
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
.if !empty(CURSES_TYPE:M*ncursesw*)
--- pkgsrc/databases/mariadb104-client/Makefile.common 2023/07/23 09:29:51 1.17
+++ pkgsrc/databases/mariadb104-client/Makefile.common 2023/08/17 08:20:27 1.18
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2023/07/23 09:29:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.18 2023/08/17 08:20:27 jperkin Exp $
#
# used by databases/mariadb104-client/Makefile
# used by databases/mariadb104-server/Makefile
@@ -91,6 +91,7 @@
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
.if !empty(CURSES_TYPE:M*ncursesw*)
--- pkgsrc/databases/mariadb105-client/Makefile.common 2023/07/23 09:29:51 1.23
+++ pkgsrc/databases/mariadb105-client/Makefile.common 2023/08/17 08:20:27 1.24
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2023/07/23 09:29:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.24 2023/08/17 08:20:27 jperkin Exp $
#
# used by databases/mariadb105-client/Makefile
# used by databases/mariadb105-server/Makefile
@@ -90,6 +90,7 @@
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
.if !empty(CURSES_TYPE:M*ncursesw*)
--- pkgsrc/databases/mariadb106-client/Makefile.common 2023/07/23 09:29:52 1.19
+++ pkgsrc/databases/mariadb106-client/Makefile.common 2023/08/17 08:20:28 1.20
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2023/07/23 09:29:52 nia Exp $
+# $NetBSD: Makefile.common,v 1.20 2023/08/17 08:20:28 jperkin Exp $
#
# used by databases/mariadb106-client/Makefile
# used by databases/mariadb106-server/Makefile
@@ -88,6 +88,7 @@
.if !empty(CURSES_TYPE:M*ncurses*)
CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON
+CPPFLAGS+= -DHAVE_CURSES_H
.endif
.if !empty(CURSES_TYPE:M*ncursesw*)