CVS commit: pkgsrc/geography/gdal-lib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jun 16 12:23:12 UTC 2024

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile options.mk

Log Message:
geography/gdal-lib: Move mysql disable into option

Also enable it if the option is enabled.  Not tested, but surely
better than it was.  Thanks markd@ for finding the cmake option, which
I could not see in -L output.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/gdal-lib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.172 pkgsrc/geography/gdal-lib/Makefile:1.173
--- pkgsrc/geography/gdal-lib/Makefile:1.172    Sun Jun 16 11:49:52 2024
+++ pkgsrc/geography/gdal-lib/Makefile  Sun Jun 16 12:23:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2024/06/16 11:49:52 markd Exp $
+# $NetBSD: Makefile,v 1.173 2024/06/16 12:23:12 gdt Exp $
 
 PKGREVISION= 2
 .include "../../geography/gdal-lib/Makefile.common"
@@ -45,7 +45,6 @@ CMAKE_CONFIGURE_ARGS+=        -DGDAL_USE_LZ4=OF
 # \todo Resolve LZMA usage.
 # GDAL_USE_LZMA appears in gtif but cmake says it doesn't exist.
 #CMAKE_CONFIGURE_ARGS+=        -DGDAL_USE_LZMA=OFF
-CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_MYSQL=OFF
 CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_ODBC=OFF
 CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_OPENEXR=OFF
 CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_PARQUET=OFF

Index: pkgsrc/geography/gdal-lib/options.mk
diff -u pkgsrc/geography/gdal-lib/options.mk:1.7 pkgsrc/geography/gdal-lib/options.mk:1.8
--- pkgsrc/geography/gdal-lib/options.mk:1.7    Tue May 21 13:36:10 2024
+++ pkgsrc/geography/gdal-lib/options.mk        Sun Jun 16 12:23:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2024/05/21 13:36:10 gdt Exp $
+# $NetBSD: options.mk,v 1.8 2024/06/16 12:23:12 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdal-lib
 
@@ -23,10 +23,9 @@ CMAKE_CONFIGURE_ARGS+=       -DGDAL_USE_POSTGR
 # \todo Fix/test MYSQL
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_MYSQL=ON
 .else
-# The builds says:
-#   -- Could NOT find MySQL (missing: MYSQL_LIBRARY MYSQL_INCLUDE_DIR)
-# but cmake -L does not show the option to turn it off.
+CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_MYSQL=OFF
 .endif
 
 # For now, there is no ODBC option, and hence only the "no ODBC" case.