Skip to content
Permalink
Browse files

mariadb-10.2: add patches from https://trac.macports.org/ticket/55916

  • Loading branch information
michaelld committed Jun 26, 2020
1 parent 7abf2b8 commit 77637c0a4ccb8b719a1d05cba2c9dbaab43a65ec
@@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
# Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
set revision_client 1
set revision_client 2
set revision_server 0
categories databases
platforms darwin
@@ -98,12 +98,16 @@ if {$subport eq $name} {
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff \
patch-libmariadb_plugins_auth_CMakeLists.txt.diff \
patch-libmariadb_cmake_install.cmake.diff \
patch-libmariadb_libmariadb_CMakeLists.txt.diff \
patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
patch-cmake_mysql_version.cmake.diff

post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/libmariadb/cmake/install.cmake
reinplace "s|@NAME@|${name_mysql}|g" \
${cmake.build_dir}/macports/macports-default.cnf \
${cmake.build_dir}/macports/my.cnf
@@ -0,0 +1,23 @@
diff --git a/libmariadb/cmake/install.cmake b/libmariadb/cmake/install.cmake
index 4a82dd9..8120366 100644
--- a/libmariadb/cmake/install.cmake
+++ b/libmariadb/cmake/install.cmake
@@ -60,13 +60,13 @@ ENDIF()
# DEFAULT layout
#

-SET(INSTALL_BINDIR_DEFAULT "bin")
-SET(INSTALL_LIBDIR_DEFAULT "lib/mariadb")
-SET(INSTALL_PCDIR_DEFAULT "lib/pkgconfig")
-SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb")
+SET(INSTALL_BINDIR_DEFAULT "lib/@NAME@/bin")
+SET(INSTALL_LIBDIR_DEFAULT "lib/@NAME@")
+SET(INSTALL_PCDIR_DEFAULT "lib/@NAME@/pkgconfig")
+SET(INSTALL_INCLUDEDIR_DEFAULT "include/@NAME@")
SET(INSTALL_DOCDIR_DEFAULT "docs")
IF(NOT IS_SUBPROJECT)
- SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
+ SET(INSTALL_PLUGINDIR_DEFAULT "lib/@NAME@/plugin")
ELSE()
ENDIF()
SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
@@ -0,0 +1,13 @@
diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_config/CMakeLists.txt
index 60d8c58..7a66cf3 100644
--- a/libmariadb/mariadb_config/CMakeLists.txt
+++ b/libmariadb/mariadb_config/CMakeLists.txt
@@ -55,7 +55,7 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
# Installation
#
INSTALL(TARGETS mariadb_config
- DESTINATION "bin"
+ DESTINATION "${INSTALL_BINDIR}"
COMPONENT Development)

INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc

0 comments on commit 77637c0

Please sign in to comment.
You can’t perform that action at this time.