diff options
| author | tnn <tnn@pkgsrc.org> | 2020-03-15 21:47:43 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-03-15 21:47:43 +0000 |
| commit | 8da29cee4e5b374dcd21dba493ca69ae99ed39c1 (patch) | |
| tree | 332dee49c4770070d3f40ccccdacdf033b71723d /geography | |
| parent | c0e33c7ecb02f1ccaf8b4cf06b263b8a4953670b (diff) | |
| download | pkgsrc-8da29cee4e5b374dcd21dba493ca69ae99ed39c1.tar.gz | |
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.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/gdal-lib/Makefile | 6 | ||||
| -rw-r--r-- | geography/gdal-lib/buildlink3.mk | 3 | ||||
| -rw-r--r-- | geography/gdal-lib/options.mk | 11 |
3 files changed, 8 insertions, 12 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 491a5f64783..7d6915e111c 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -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 ${PKGMANDIR}/man1 share/gdal # 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" diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index ab37d354290..4a62b8c7c7f 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -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" diff --git a/geography/gdal-lib/options.mk b/geography/gdal-lib/options.mk index e63b176949b..fc9fe66acb3 100644 --- a/geography/gdal-lib/options.mk +++ b/geography/gdal-lib/options.mk @@ -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 |