mysql80*: SunOS build and install fixes.

NetBSD · May 26, 2023 · 9abc4d4 · 9abc4d4
1 parent cb76eb7
commit 9abc4d4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/databases/mysql80-client/Makefile.common b/databases/mysql80-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2023/05/23 21:01:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2023/05/26 11:13:52 jperkin Exp $
 #
 # used by databases/mysql80-client/Makefile
 # used by databases/mysql80-server/Makefile
@@ -63,7 +63,6 @@ CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=		-DLOCAL_BOOST_DIR="${WRKSRC}/boost"
 CMAKE_ARGS+=		-DWITH_BUILD_ID=OFF
 CMAKE_ARGS+=		-DWITH_CURL="system"
-CMAKE_ARGS+=		-DWITH_FIDO="system"
 CMAKE_ARGS+=		-DWITH_ICU="system"
 CMAKE_ARGS+=		-DWITH_LIBEVENT="system"
 CMAKE_ARGS+=		-DWITH_LZ4="system"
@@ -110,6 +109,11 @@ CMAKE_ARGS+=	-DWITH_READLINE="system"
 CMAKE_ARGS+=	-DWITH_EDITLINE="system"
 .endif
 
+.if ${OPSYS} != "SunOS"
+CMAKE_ARGS+=		-DWITH_FIDO="system"
+.include "../../security/libfido2/buildlink3.mk"
+.endif
+
 .if ${OPSYS} == "NetBSD"
 CFLAGS.NetBSD+=		-DHAVE_ALLOCA_H
 CXXFLAGS.NetBSD+=	-DHAVE_ALLOCA_H
@@ -124,7 +128,6 @@ post-patch:
 .include "../../devel/libevent/buildlink3.mk"
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.11
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/libfido2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

diff --git a/databases/mysql80-client/distinfo b/databases/mysql80-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2023/05/23 21:01:12 adam Exp $
+$NetBSD: distinfo,v 1.10 2023/05/26 11:13:52 jperkin Exp $
 
 BLAKE2s (mysql-boost-8.0.33.tar.gz) = 6b64fb998afe1854c6a9168b82a11e4254d30d439d4730914863e86ea4ff9071
 SHA512 (mysql-boost-8.0.33.tar.gz) = 47f76819004c7c545d1b0b6b6646d8816899976f92d35c5564b1255b144b597ff7d3e674c721a45bcbb13cc0da3f4474fb29221c0e21d2ff91a1892cd42c636c
@@ -21,6 +21,7 @@ SHA1 (patch-include_violite.h) = adbdf539d2ec0e225e1c38a7a1ec8b4cfb28f4d0
 SHA1 (patch-libmysql_CMakeLists.txt) = 7b83faf1751ad40f20bca1ebcdac0cebb1370443
 SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
 SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
+SHA1 (patch-packaging_solaris_CMakeLists.txt) = 135c4aa07d9b20a9b56b8f1616821abfedb52ecb
 SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = ade643148787438d6d6f1f7b2636bbd0af87d70f
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_internet.h) = 29e019236423aaa77b71b273d009404e4fbafe73

diff --git a/databases/mysql80-client/patches/patch-packaging_solaris_CMakeLists.txt b/databases/mysql80-client/patches/patch-packaging_solaris_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-packaging_solaris_CMakeLists.txt,v 1.1 2023/05/26 11:13:52 jperkin Exp $
+
+Limit files to mysql80-server.
+
+--- packaging/solaris/CMakeLists.txt.orig	2023-03-16 17:22:37.000000000 +0000
++++ packaging/solaris/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ # Any files in this directory are auxiliary files for Solaris "pkg" packages.
+ # They will be configured during "pkg" creation, not during (binary) build.
+
+-IF(NOT SOLARIS)
++IF(NOT SOLARIS OR WITHOUT_SERVER)
+   RETURN()
+ ENDIF()
+