CVS commit: pkgsrc/geography/gdal-lib

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Thu Dec 29 19:45:48 UTC 2022

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile.common

Log Message:
gdal-lib: fix CONFIGURE_ARGS reference to non-existent directory

The configure script for gdal-lib specifies locations for various
required libraries via command line arguments.  For example, the
configure script defines compiler flags for the location of libz based
upon the --with-libz argument as follows:

EXTRA_INCLUDES="-I$with_libz -I$with_libz/include $EXTRA_INCLUDES"

Since the origin of the package, the location of libz has been
specified in Makefile.common as follows:

CONFIGURE_ARGS+=        --with-libz=${BUILDLINK_PREFIX.zlib}/include

In a typical pkgsrc installation, the configure script is run with the
argument --with-libz=/usr/pkg/include, which leads to the following
compiler flags:

          -I/usr/pkg/include -I/usr/pkg/include/include

The latter directory of course generally never exists.  Although this
has apparently worked in the past, gcc12 exits with an error.

This patch removes the extra /include suffix from the libz location
specified in CONFIGURE_ARGS.  As a result, libz now matches the way
other libraries are specified, none of which include the /include
suffix and all of which are handled in the configure script in similar
ways.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/geography/gdal-lib/Makefile.common

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.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.22 pkgsrc/geography/gdal-lib/Makefile.common:1.23
--- pkgsrc/geography/gdal-lib/Makefile.common:1.22      Sun Nov 27 01:10:22 2022
+++ pkgsrc/geography/gdal-lib/Makefile.common   Thu Dec 29 19:45:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2022/11/27 01:10:22 gdt Exp $
+# $NetBSD: Makefile.common,v 1.23 2022/12/29 19:45:48 brook Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
@@ -32,7 +32,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --with-geos
 CONFIGURE_ARGS+=       --with-libjson-c=internal
 CONFIGURE_ARGS+=       --with-libtiff=${BUILDLINK_PREFIX.tiff}
-CONFIGURE_ARGS+=       --with-libz=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=       --with-libz=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --with-netcdf=${BUILDLINK_PREFIX.netcdf}
 CONFIGURE_ARGS+=       --with-webp=${BUILDLINK_PREFIX.libwebp}
 CONFIGURE_ARGS+=       --with-xerces