diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-09-15 16:48:21 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-09-15 16:48:21 +0000 |
| commit | 9de1f680c8bc0e55d53d0d651eb8a1f43534d80f (patch) | |
| tree | 3c7b6412d151ff010efacdd71df917d3dfc24cb6 /geography | |
| parent | 737fe4f44df84c9b506038470ff7c0b8af826aac (diff) | |
| download | pkgsrc-9de1f680c8bc0e55d53d0d651eb8a1f43534d80f.tar.gz | |
Fix occasional parallel build failure, it seems CPPFLAGS gets confused and
misses the gcore directory required for gdal_version.h. Add it explicitly
for all builds.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/gdal-lib/distinfo | 3 | ||||
| -rw-r--r-- | geography/gdal-lib/patches/patch-GDALmake.opt.in | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index 86008f95b53..ff53120c8ac 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.22 2014/05/23 13:04:09 obache Exp $ +$NetBSD: distinfo,v 1.23 2014/09/15 16:48:21 jperkin Exp $ SHA1 (gdal-1.9.2.tar.gz) = 7eda6a4d735b8d6903740e0acdd702b43515e351 RMD160 (gdal-1.9.2.tar.gz) = 1ab34a85946bae4313cbd925cdbbf728d23d7b57 Size (gdal-1.9.2.tar.gz) = 9495381 bytes +SHA1 (patch-GDALmake.opt.in) = 6bae7f2bfea619d6b96bb0709f31e84a2eb764a5 SHA1 (patch-frmts_gif_biggifdataset.cpp) = ec591ad57fdc96e04713ef769f93df6b8e101e0d SHA1 (patch-frmts_gif_gifabstractdataset.cpp) = a36bfacd0c1c329d221af8554fa8d236033b970d SHA1 (patch-frmts_gif_gifdataset.cpp) = 7d307e0530bad5f5364e08c157e45c39b20b5026 diff --git a/geography/gdal-lib/patches/patch-GDALmake.opt.in b/geography/gdal-lib/patches/patch-GDALmake.opt.in new file mode 100644 index 00000000000..84144a51251 --- /dev/null +++ b/geography/gdal-lib/patches/patch-GDALmake.opt.in @@ -0,0 +1,19 @@ +$NetBSD: patch-GDALmake.opt.in,v 1.1 2014/09/15 16:48:21 jperkin Exp $ + +Fix occasional paralle build failure: + + ogr/ogr_core.h:34:26: fatal error: gdal_version.h: No such file or directory + +by ensuring we have the correct includes. + +--- GDALmake.opt.in.orig 2012-10-09 00:58:28.000000000 +0000 ++++ GDALmake.opt.in +@@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc + INST_MAN = @mandir@ + INST_HTML = $(HOME)/www/gdal + +-CPPFLAGS = @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ ++CPPFLAGS = @CPPFLAGS@ -I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore @EXTRA_INCLUDES@ + CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS) + CXXFLAGS = @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS) + LDFLAGS = @LDFLAGS@ |