diff options
| author | Martchus | 2022-04-02 21:01:31 +0200 |
|---|---|---|
| committer | Martchus | 2022-04-02 21:01:31 +0200 |
| commit | 4c1a40ef5c94e93265cebfa0c565a5bfd95f813a (patch) | |
| tree | 1f300d2969de4a3863205813e6695194250196e5 /0002-Enable-pkg-config-for-mingw-w64-build.patch | |
| parent | fb66001babc0d4610604b754e8d5d2475e9f9f2b (diff) | |
| download | aur-4c1a40ef5c94e93265cebfa0c565a5bfd95f813a.tar.gz | |
Update to 3.2.6
Diffstat (limited to '0002-Enable-pkg-config-for-mingw-w64-build.patch')
| -rw-r--r-- | 0002-Enable-pkg-config-for-mingw-w64-build.patch | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/0002-Enable-pkg-config-for-mingw-w64-build.patch b/0002-Enable-pkg-config-for-mingw-w64-build.patch index 13fa33c109d2..4219449592d2 100644 --- a/0002-Enable-pkg-config-for-mingw-w64-build.patch +++ b/0002-Enable-pkg-config-for-mingw-w64-build.patch @@ -1,17 +1,18 @@ -From 091383f76b2b35181ce44902b5488cdc25c29d45 Mon Sep 17 00:00:00 2001 +From d9eb742e22a1a72b4b5c1b09f6a7b6b606c5613e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 12 Sep 2020 20:30:49 +0200 Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build --- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + CMakeLists.txt | 2 +- + libmariadb/CMakeLists.txt | 10 ++-------- + 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c8a362..6c30c53 100644 +index 93bf967..247d361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -417,7 +417,7 @@ ENDIF() +@@ -422,7 +422,7 @@ ENDIF() INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(libmariadb) @@ -20,6 +21,27 @@ index 7c8a362..6c30c53 100644 ADD_SUBDIRECTORY(mariadb_config) ENDIF() +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index b9a1618..5f8c657 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -459,14 +459,8 @@ ENDIF() + INSTALL(TARGETS mariadbclient + COMPONENT Development + DESTINATION ${INSTALL_LIBDIR}) +-# in cmake 3.12+ we can use +-#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} +-# COMPONENT SharedLibraries NAMELINK_COMPONENT Development) +-# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use +-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} +- COMPONENT SharedLibraries NAMELINK_SKIP) +-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} +- COMPONENT Development NAMELINK_ONLY) ++INSTALL(TARGETS mariadb RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} LIBRARY DESTINATION ${INSTALL_LIBDIR} ++ COMPONENT SharedLibraries NAMELINK_COMPONENT Development) + + IF(MSVC) + # On Windows, install PDB -- -2.34.1 +2.35.1 |