From 2fa5c055c253fd1a14edd8571f2198614e5e0b0f Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 22 Nov 2020 00:38:29 +0100 Subject: [PATCH] add rpc patch from fedora --- gdal.spec | 2 ++ gdal_tirpcinc.patch | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 gdal_tirpcinc.patch diff --git a/gdal.spec b/gdal.spec index de3e09e..8d365f0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -62,6 +62,7 @@ Patch3: %{name}-rasdaman.patch Patch4: %{name}-pluginsdir.patch Patch5: libx32.patch Patch7: decl.patch +Patch8: %{name}_tirpcinc.patch URL: http://www.gdal.org/ # 1.x or 2.x supported BuildRequires: CharLS-devel @@ -273,6 +274,7 @@ Moduł Pythona GDAL. %patch4 -p1 %patch5 -p1 %patch7 -p1 +%patch8 -p1 # need to regenerate (old ones don't support perl 5.10) %{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp} diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch new file mode 100644 index 0000000..de5985f --- /dev/null +++ b/gdal_tirpcinc.patch @@ -0,0 +1,24 @@ +diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile +--- gdal-3.2.0-fedora/frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100 +@@ -4,7 +4,7 @@ include ../../GDALmake.opt + + OBJ = dodsdataset2.o + +-CPPFLAGS := $(CPPFLAGS) $(DODS_INC) ++CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc + + default: $(OBJ:.o=.$(OBJ_EXT)) + +diff -rupN --no-dereference gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile +--- gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100 ++++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +0100 +@@ -5,7 +5,7 @@ include ../../../GDALmake.opt + OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \ + ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o + +-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL ++CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc + + default: $(O_OBJ:.o=.$(OBJ_EXT)) + -- 2.43.0