CVS commit: pkgsrc/geography/gdal-lib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 15 21:47:43 UTC 2020

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

Log Message:
gdal-lib: remove the sqlite option and enable it always

Because gdal-lib depends unconditionally on geograpy/proj, which depends
unconditionally on sqlite3, it doesn't make sense dependency-wise to
conditionally omit sqlite3 support here.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/geography/gdal-lib/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 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.122 pkgsrc/geography/gdal-lib/Makefile:1.123
--- pkgsrc/geography/gdal-lib/Makefile:1.122    Wed Mar 11 12:55:36 2020
+++ pkgsrc/geography/gdal-lib/Makefile  Sun Mar 15 21:47:43 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.122 2020/03/11 12:55:36 gdt Exp $
+# $NetBSD: Makefile,v 1.123 2020/03/15 21:47:43 tnn Exp $
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
 
@@ -18,6 +18,7 @@ USE_LANGUAGES+=       c99 c++11
 CONFIGURE_ARGS+=       --without-python
 
 CONFIGURE_ARGS+=       --with-proj
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 
 MAKE_FILE=             GNUmakefile
 
@@ -30,6 +31,7 @@ INSTALLATION_DIRS=    bin include lib ${PKG
 # jasper uses SIZE_MAX and friends in its headers.
 CPPFLAGS+=     -D__STDC_LIMIT_MACROS
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/buildlink3.mk
diff -u pkgsrc/geography/gdal-lib/buildlink3.mk:1.58 pkgsrc/geography/gdal-lib/buildlink3.mk:1.59
--- pkgsrc/geography/gdal-lib/buildlink3.mk:1.58        Sun Mar  8 16:47:44 2020
+++ pkgsrc/geography/gdal-lib/buildlink3.mk     Sun Mar 15 21:47:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.58 2020/03/08 16:47:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.59 2020/03/15 21:47:43 tnn Exp $
 
 BUILDLINK_TREE+=       gdal-lib
 
@@ -20,6 +20,7 @@ pkgbase := gdal-lib
 .include "../../mk/mysql.buildlink3.mk"
 .endif
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/options.mk
diff -u pkgsrc/geography/gdal-lib/options.mk:1.4 pkgsrc/geography/gdal-lib/options.mk:1.5
--- pkgsrc/geography/gdal-lib/options.mk:1.4    Sun Nov  3 19:30:33 2019
+++ pkgsrc/geography/gdal-lib/options.mk        Sun Mar 15 21:47:43 2020
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2019/11/03 19:30:33 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/03/15 21:47:43 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdal-lib
 
 # Note that these are not a mutually-exclusive group.
-PKG_SUPPORTED_OPTIONS= pgsql mysql sqlite
+PKG_SUPPORTED_OPTIONS= pgsql mysql
 # By default, omit database support, because there isn't an
 # articulated use case and dependency management becomes very painful.
 # For example, depending on pgsql fixes a version, but doesn't put it
@@ -26,10 +26,3 @@ CONFIGURE_ARGS+=     --with-mysql
 .else
 CONFIGURE_ARGS+=       --without-mysql
 .endif
-
-.if !empty(PKG_OPTIONS:Msqlite)
-.  include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
-.else
-CONFIGURE_ARGS+=       --without-sqlite3
-.endif