cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add explicit dependency on math/qhull, since it was detected at build

Browse Source 
time if found (and failed to build), or the bundled version was used
otherwise..

Reported by espie@
This commit is contained in:
landry 2016-05-25 20:53:45 +00:00
parent c9b07f2607
commit 3df6e7d336
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo/gdal/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2016/05/15 12:29:20 landry Exp $
# $OpenBSD: Makefile,v 1.48 2016/05/25 20:53:45 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
@ -32,6 +32,7 @@ MULTI_PACKAGES = -main -python -perl
LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/tiff \
net/curl \
math/qhull \
databases/postgresql \
geo/geos \
geo/spatialite/libspatialite \
@ -46,7 +47,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/proj \
devel/geotiff
WANTLIB-main = ${WANTLIB} c expat m stdc++ z tiff openjp2 ssl crypto \
WANTLIB-main = ${WANTLIB} c expat m stdc++ z tiff openjp2 ssl crypto qhull \
curl pq geos geos_c idn png gif jpeg jasper json-c geotiff \
proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2

17
geo/gdal/patches/patch-configure
View File

@ -1,6 +1,10 @@
$OpenBSD: patch-configure,v 1.12 2016/05/15 12:18:26 landry Exp $
$OpenBSD: patch-configure,v 1.13 2016/05/25 20:53:45 landry Exp $
chunk 1&2: adapt paths for our openjp2 install
chunk 3: fix libqhull detection under /usr/local (https://trac.osgeo.org/gdal/ticket/6522)
--- configure.orig Mon Apr 25 19:35:51 2016
+++ configure Fri May 13 09:46:29 2016
+++ configure Sun May 22 21:15:52 2016
@@ -23677,9 +23677,9 @@ fi
LIBS="-lopenjp2 $LIBS"
fi
@ -22,3 +26,12 @@ $OpenBSD: patch-configure,v 1.12 2016/05/15 12:18:26 landry Exp $
OPENJPEG_VERSION=20100
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
else
@@ -29227,7 +29227,7 @@ fi
if test -f /usr/include/libqhull/libqhull.h; then
EXTRA_INCLUDES="-I/usr/include/libqhull $EXTRA_INCLUDES"
else
- EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"
+ EXTRA_INCLUDES="-I/usr/local/include/libqhull $EXTRA_INCLUDES"
fi
LIBS="-lqhull $LIBS"
fi