Merge branch 'v0.47_fixes'

.ci/docker-compose-geos.yml

@@ -7,6 +7,6 @@ services:
         ALPINE_VERSION: $alpine_version
         GEOS_VERSION: $geos_version
     working_dir: /mnt/sf
-    entrypoint: go test -test.count=1 -test.run=. ./geos ./internal/rawgeos
+    entrypoint: go test $tags -test.count=1 -test.run=. ./geos ./internal/rawgeos
     volumes:
       - ..:/mnt/sf

.ci/geos.Dockerfile

@@ -4,11 +4,6 @@ FROM alpine:${ALPINE_VERSION}
 ARG GEOS_VERSION
 RUN apk add pkgconfig gcc musl-dev geos-dev=${GEOS_VERSION}
 
-# Alpine 3.13 doesn't include the geos.pc file, so we need to add it manually.
-# It doesn't hurt to add it manually for other versions of Alpine either, so we
-# just add it unconditionally.
-COPY alpine_geos.pc /usr/lib/pkgconfig/geos.pc
-
 COPY --from=golang:1.21-alpine /usr/local/go /usr/local/go
 ENV PATH=${PATH}:/usr/local/go/bin
 RUN go version

CHANGELOG.md

@@ -20,6 +20,18 @@ YYYY-MM-DD
 - Adds wrappers in the `geos` package for the `GEOSConcaveHull_r` function
   (exposed as `ConcaveHull`).
 
+## v0.47.2
+
+2024-04-15
+
+- Adds support for the `sfnopkgconfig` build tag, which has an effect on the
+  build process of the `github.com/peterstace/geos` package. It causes the
+  `#cgo pkg-config` directive to be replaced with the `#cgo LDFLAGS: -lgeos_c`
+  directive (which was the previous behaviour, before v0.47.1).  This is useful
+  in environments where `pkg-config` is not available or the `geos.pc` file is
+  not installed. The majority of systems won't need to use the `sfnopkgconfig`
+  build tag.
+
 ## v0.47.1
 
 2024-03-08

Makefile

@@ -52,7 +52,11 @@ geos-3.9:
 
 .PHONY: geos-3.8
 geos-3.8:
-	export alpine_version=3.13 geos_version=3.8.1-r2; $(DC_GEOS_RUN)
+	# Alpine 3.13 doesn't include a geos.pc file (needed by pkg-config). So
+	# the sfnopkgconfig tag is used, disabling the use of pkg-config.
+	# LDFLAGS are used to configure GEOS directly.
+	export tags='-tags sfnopkgconfig' \
+	       alpine_version=3.13 geos_version=3.8.1-r2; $(DC_GEOS_RUN)
 
 .PHONY: geos
 geos: geos-3.12

internal/rawgeos/configure_hardcoded.go

@@ -0,0 +1,9 @@
+//go:build sfnopkgconfig
+
+package rawgeos
+
+/*
+#cgo LDFLAGS: -lgeos_c
+#cgo CFLAGS: -Wall
+*/
+import "C"

internal/rawgeos/configure_pkg_config.go

@@ -0,0 +1,9 @@
+//go:build !sfnopkgconfig
+
+package rawgeos
+
+/*
+#cgo pkg-config: geos
+#cgo CFLAGS: -Wall
+*/
+import "C"

internal/rawgeos/entrypoints.go

@@ -1,8 +1,6 @@
 package rawgeos
 
 /*
-#cgo pkg-config: geos
-#cgo CFLAGS: -Wall
 #include "geos_c.h"
 #include <stdlib.h>
 

internal/rawgeos/generic_operations.go

@@ -1,8 +1,6 @@
 package rawgeos
 
 /*
-#cgo pkg-config: geos
-#cgo CFLAGS: -Wall
 #include "geos_c.h"
 */
 import "C"

internal/rawgeos/handle.go

@@ -1,8 +1,6 @@
 package rawgeos
 
 /*
-#cgo pkg-config: geos
-#cgo CFLAGS: -Wall
 #include "geos_c.h"
 #include <stdlib.h>
 #include <string.h>