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

Modify include paths order to prevent postgis from using system wide

Browse Source 
devel/uthash headers if they are installed.

OK landry@
This commit is contained in:
fcambus 2019-11-09 15:19:50 +00:00
parent 1e3f235e4a
commit b12beb061b
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
geo/postgis/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.57 2019/10/31 19:49:15 landry Exp $
# $OpenBSD: Makefile,v 1.58 2019/11/09 15:19:50 fcambus Exp $
V = 3.0.0
COMMENT= geographic objects support for PostgreSQL
DISTNAME= postgis-${V}
REVISION= 0
CATEGORIES= geo databases
SHARED_LIBS += lwgeom 0.0 lwgeom-3.0 0.0 # 4.0

17
geo/postgis/patches/patch-postgis_Makefile_in Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-postgis_Makefile_in,v 1.1 2019/11/09 15:19:50 fcambus Exp $
Modify include paths order to prevent postgis from using system wide
devel/uthash headers if they are installed.
Index: postgis/Makefile.in
--- postgis/Makefile.in.orig
+++ postgis/Makefile.in
@@ -142,7 +142,7 @@ OBJS=$(PG_OBJS)
# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
# older version of PostGIS, rather than with the static liblwgeom.a
# supplied with newer versions of PostGIS
-PG_CPPFLAGS += -I../liblwgeom @CFLAGS@ -I../libpgcommon $(WAYGU_INCLUDE) $(UTHASH_INCLUDE) @CPPFLAGS@ @PICFLAGS@
+PG_CPPFLAGS += -I../liblwgeom $(UTHASH_INCLUDE) @CFLAGS@ -I../libpgcommon $(WAYGU_INCLUDE) @CPPFLAGS@ @PICFLAGS@
SHLIB_LINK_F = $(WAYGU_LIB) ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
# Add SFCGAL Flags if defined