32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 9c5213d34d9d9b72516832afa70824941cec0961 Mon Sep 17 00:00:00 2001
|
|
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
Date: Sat, 21 May 2022 01:36:44 -0400
|
|
Subject: [PATCH 2/4] Use pkg-config to find GEOS instead of geos-config
|
|
|
|
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
---
|
|
setup.py | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 8e061479..e1db810e 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -81,11 +81,11 @@ def file_walk_relative(top, remove=''):
|
|
|
|
# GEOS
|
|
try:
|
|
- geos_version = subprocess.check_output(['geos-config', '--version'])
|
|
+ geos_version = subprocess.check_output(['pkg-config', '--modversion', 'geos'])
|
|
geos_version = tuple(int(v) for v in geos_version.split(b'.')
|
|
if 'dev' not in str(v))
|
|
- geos_includes = subprocess.check_output(['geos-config', '--includes'])
|
|
- geos_clibs = subprocess.check_output(['geos-config', '--clibs'])
|
|
+ geos_includes = subprocess.check_output(['pkg-config', '--cflags', 'geos'])
|
|
+ geos_clibs = subprocess.check_output(['pkg-config', '--libs', 'geos'])
|
|
except (OSError, ValueError, subprocess.CalledProcessError):
|
|
warnings.warn(
|
|
'Unable to determine GEOS version. Ensure you have %s or later '
|
|
--
|
|
2.36.1
|
|
|