Date: Mon, 4 Sep 2023 21:31:19 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6a4bcec9b9fc - main - graphics/gdal: Simplify 18e5fa858bb60e1c70006acf2e6b966d411dd8de Message-ID: <202309042131.384LVJhd091909@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a4bcec9b9fcb4d66a14ab89bb48242701c1c13e commit 6a4bcec9b9fcb4d66a14ab89bb48242701c1c13e Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-09-04 21:25:21 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-09-04 21:30:05 +0000 graphics/gdal: Simplify 18e5fa858bb60e1c70006acf2e6b966d411dd8de Use CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX instead of mixed method of Makefile and CMake --- graphics/gdal/Makefile | 1 - graphics/gdal/files/patch-mysql | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index a06daf493b9f..0f6802fc166f 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -199,7 +199,6 @@ ZSTD_CMAKE_BOOL= GDAL_USE_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/cmake/modules/packages/FindMySQL.cmake # Clean up bundled libraries @${RM} -r ${WRKSRC}/alg/internal_libqhull/ @${RM} -r ${WRKSRC}/frmts/gif/giflib/ diff --git a/graphics/gdal/files/patch-mysql b/graphics/gdal/files/patch-mysql index 0ecdfcec739d..9b5d8032dc6f 100644 --- a/graphics/gdal/files/patch-mysql +++ b/graphics/gdal/files/patch-mysql @@ -1,11 +1,10 @@ --- cmake/modules/packages/FindMySQL.cmake.orig 2023-07-06 11:14:14 UTC +++ cmake/modules/packages/FindMySQL.cmake -@@ -23,7 +23,7 @@ if( MYSQL_INCLUDE_DIR AND EXISTS "${MYSQL_INCLUDE_DIR} +@@ -23,6 +23,7 @@ if( MYSQL_INCLUDE_DIR AND EXISTS "${MYSQL_INCLUDE_DIR} "${MYSQL_VERSION_H}" ) endif() --find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r) -+find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r PATHS %%LOCALBASE%%/lib/mysql) ++set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "mysql") + find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r) if( NOT CMAKE_C_COMPILER_LOADED ) - message(AUTHOR_WARNING "C language not enabled: Skipping detection of extra link libraries.")home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309042131.384LVJhd091909>