mariadb/mariadb-pcdir.patch

Use PCDIR CMake option, if configured

Upstream install the server pkgconfig file into arch-independent directory
Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340

--- mariadb-10.5.5/support-files/CMakeLists.txt.old	2020-09-30 10:36:08.582490318 +0200
+++ mariadb-10.5.5/support-files/CMakeLists.txt	2020-09-30 10:38:58.079710848 +0200
@@ -91,7 +91,11 @@
   ENDIF()
 
   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
+IF(INSTALL_PCDIR)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
+ELSE()
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
+ENDIF()
 
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
Rebase to 10.5.1 - Beta Update to build against PCRE2 2020-09-11 07:35:04 +00:00			`Use PCDIR CMake option, if configured`

			`Upstream install the server pkgconfig file into arch-independent directory`
			`Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340`

Fix of mariadb-ownsetup patch. Since we do CMake out-of-source builds, and the SOURCE and BUILD directiories differ, the bug that was present in the patch started to cause a issues. In the CMake "CONFIGURE_FILE(<input> <output>)" command, the <input> path is treated relative to SOURCE dir, however the <output> patch is relative to BUILD dir. Since the file has been copied to a wrong location, instead in-place updated as originally intended, the file that was later installed was the original unchanged file. Resolves: #1873999, #1874446 Fix mariadb-pcdir.patch hunk 2020-09-03 11:39:29 +00:00			`--- mariadb-10.5.5/support-files/CMakeLists.txt.old 2020-09-30 10:36:08.582490318 +0200`
			`+++ mariadb-10.5.5/support-files/CMakeLists.txt 2020-09-30 10:38:58.079710848 +0200`
			`@@ -91,7 +91,11 @@`
			`ENDIF()`
Rebase to 10.5.1 - Beta Update to build against PCRE2 2020-09-11 07:35:04 +00:00
			`CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)`
			`+IF(INSTALL_PCDIR)`
			`+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)`
			`+ELSE()`
Rebase to 10.5.2 - Beta TokuDB SE has been deprecated https://jira.mariadb.org/browse/MDEV-19780 Remove the RocksDB manpage when RocksDB is not built Add failing tests 2020-04-09 01:42:54 +00:00			`INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)`
Rebase to 10.5.1 - Beta Update to build against PCRE2 2020-09-11 07:35:04 +00:00			`+ENDIF()`

			`INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)`