diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-07-23 07:19:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 16:19:26 -0700 |
| commit | 5293c8685a9d1b880a334b40a40a73ee667a294f (patch) | |
| tree | 86066977609a17317e908843a5ed81887b1f6ec4 /ports/libmariadb/fix-InstallPath.patch | |
| parent | 8886d85ad0215a7f30459f5a3c495a0f7c4d6a88 (diff) | |
| download | vcpkg-5293c8685a9d1b880a334b40a40a73ee667a294f.tar.gz vcpkg-5293c8685a9d1b880a334b40a40a73ee667a294f.zip | |
[libmariadb] Fix plugin installation, fix pkgconfig (#18769)
* [libmariadb] Fix plugin installation, fix pkgconfig
* fix installation
* update version stuff
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Diffstat (limited to 'ports/libmariadb/fix-InstallPath.patch')
| -rw-r--r-- | ports/libmariadb/fix-InstallPath.patch | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index 812e6c1a6..bdf81788e 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -1,18 +1,18 @@ -diff --git a/cmake/install_plugins.cmake b/cmake/install_plugins.cmake -index b8d15ba..7f59db7 100644 ---- a/cmake/install_plugins.cmake -+++ b/cmake/install_plugins.cmake -@@ -8,7 +8,7 @@ - # plugin installation +diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in +index a82dbb7..e9005fa 100644 +--- a/include/mariadb_version.h.in ++++ b/include/mariadb_version.h.in +@@ -30,7 +30,7 @@ + #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@ + #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@" + #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@" +-#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" ++#define MARIADB_PLUGINDIR "../@INSTALL_PLUGINDIR@" - MACRO(INSTALL_PLUGIN name binary_dir) -- INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR}) -+ INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR}/../../../bin/plugin) - IF(MSVC) - INSTALL(FILES $<TARGET_PDB_FILE:${name}> COMPONENT Debuginfo - DESTINATION symbols CONFIGURATIONS Debug RelWithDebInfo) + /* mysqld compile time options */ + #ifndef MYSQL_CHARSET diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 14e34ab..083a863 100644 +index bcfd4de..c109a20 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt @@ -398,10 +398,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) @@ -28,7 +28,7 @@ index 14e34ab..083a863 100644 TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient) SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() -@@ -457,13 +457,15 @@ ENDIF() +@@ -453,13 +453,15 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development @@ -47,3 +47,16 @@ index 14e34ab..083a863 100644 # On Windows, install PDB INSTALL(FILES $<TARGET_PDB_FILE:libmariadb> DESTINATION "${INSTALL_LIBDIR}" CONFIGURATIONS Debug RelWithDebInfo +diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in +index 5574943..fc1ca7c 100644 +--- a/mariadb_config/mariadb_config.c.in ++++ b/mariadb_config/mariadb_config.c.in +@@ -210,7 +210,7 @@ end: + } + if (!p || !p[0]) + { +- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); ++ strncpy(installation_dir, "../@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); + return; + } + } |