mysql80-client: fix macOS build (NetBSD still builds).

NetBSD · Dec 4, 2024 · ece65e1 · ece65e1
1 parent 32cdccf
commit ece65e1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/databases/mysql80-client/distinfo b/databases/mysql80-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2024/08/29 14:42:13 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2024/12/04 22:13:00 schmonz Exp $
 
 BLAKE2s (mysql-boost-8.0.39.tar.gz) = 1fb0b49bc3d648b15bce455aa18ab4ed95a698419697744edcdf92445d03ee55
 SHA512 (mysql-boost-8.0.39.tar.gz) = 2a2785c89b59cb198d1cf383584d453d058352f0d42e485e5315163fd03e404ea4c6281ab9eb0eb7103768057af52a99dd93cb1890b61edada0d27e0ba32ed44
 Size (mysql-boost-8.0.39.tar.gz) = 449265424 bytes
-SHA1 (patch-CMakeLists.txt) = b6867d0527e19f44734428ef54a51f178e045fd8
+SHA1 (patch-CMakeLists.txt) = ecca84044c0b5901918ed1a3b0d073584c19185e
 SHA1 (patch-client_CMakeLists.txt) = 4fbaf94d43b6c58aa14712213c08b897bd6227cf
 SHA1 (patch-cmake_ldap.cmake) = 46f0df1109ca0886e0d0903a39e25278139f1849
 SHA1 (patch-cmake_os_SunOS.cmake) = 66a7d4386f07c68ae85a94d467465e6d1bec6b57

diff --git a/databases/mysql80-client/patches/patch-CMakeLists.txt b/databases/mysql80-client/patches/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2024/02/16 22:01:10 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2024/12/04 22:13:00 schmonz Exp $
 
 HOMEBREW_HOME is provided by pkgsrc.
 Split configuration between mysql-client and mysql-server.
 Do not install documentation.
 
---- CMakeLists.txt.orig	2023-12-12 18:09:36.000000000 +0000
+--- CMakeLists.txt.orig	2024-07-12 19:15:25.000000000 +0000
 +++ CMakeLists.txt
-@@ -1697,14 +1697,6 @@ SET(SYSTEM_LIBRARIES
+@@ -1711,14 +1711,6 @@ SET(SYSTEM_LIBRARIES
    FIDO      # Homebrew  libfido2
    )
 
@@ -21,7 +21,16 @@ Do not install documentation.
 
  SET(WITH_SYSTEM_LIBS_DEFAULT OFF)
  OPTION(WITH_SYSTEM_LIBS
-@@ -2207,11 +2199,12 @@ ENDIF()
+@@ -1956,7 +1948,7 @@ MYSQL_CHECK_RAPIDJSON()
+ MYSQL_CHECK_FIDO()
+ MYSQL_CHECK_FIDO_DLLS()
+
+-IF(APPLE)
++IF(APPLE AND HOMEBREW_HOME)
+   GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY)
+   IF(EXISTS ${HOMEBREW_BASE}/include/boost)
+     FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO)
+@@ -2232,11 +2224,12 @@ ENDIF()
 
  ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(utilities)
@@ -36,7 +45,7 @@ Do not install documentation.
    ADD_SUBDIRECTORY(sql)
  ENDIF()
 
-@@ -2308,7 +2301,7 @@ IF(ENABLE_GCOV)
+@@ -2336,7 +2329,7 @@ IF(ENABLE_GCOV)
    INCLUDE(fastcov)
  ENDIF()
 
@@ -45,23 +54,23 @@ Do not install documentation.
    ADD_SUBDIRECTORY(man)
  ENDIF()
 
-@@ -2342,6 +2335,7 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY A
+@@ -2370,6 +2363,7 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY A
    "${CMAKE_BINARY_DIR}/library_output_directory"
    )
 
 +IF(HAVE_BUILD_ID_SUPPORT AND NOT WITHOUT_SERVER)
  # Handle the "INFO_*" files.
  INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
  # Source: This can be done during the cmake phase, all information is
-@@ -2355,7 +2349,6 @@ MY_ADD_CUSTOM_TARGET(INFO_SRC ALL
+@@ -2383,7 +2377,6 @@ MY_ADD_CUSTOM_TARGET(INFO_SRC ALL
    COMMENT "Generating Docs/INFO_SRC"
  )
 
 -IF(HAVE_BUILD_ID_SUPPORT AND NOT WITHOUT_SERVER)
    # Show it by default in pushuild, but not for developers.
    IF(DEFINED ENV{PB2WORKDIR})
      OPTION(SHOW_BUILD_ID "Show mysqld build id as final target" ON)
-@@ -2466,7 +2459,7 @@ ENDIF()
+@@ -2494,7 +2487,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #