diff --git a/science/gis/gdal/actions.py b/science/gis/gdal/actions.py
index 6d20c1220f..d084911fa1 100644
--- a/science/gis/gdal/actions.py
+++ b/science/gis/gdal/actions.py
@@ -9,58 +9,60 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import perlmodules
-from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import python3modules, cmaketools
def setup():
options_cfg = ''.join([
- '--with-png ',
- '--with-curl ',
- '--with-geos ',
- '--with-hdf5 ',
- '--with-perl ',
- '--with-expat ',
- '--with-mysql ',
- '--with-netcdf ',
- '--with-geotiff ',
- '--with-libtiff ',
- '--with-sqlite3 ',
- '--enable-shared ',
- '--with-openjpeg ',
- '--with-spatialite'])
+ '-DGDAL_USE_PNG=ON ',
+ '-DGDAL_USE_CURL=ON ',
+ '-DGDAL_USE_GEOS=ON ',
+ '-DGDAL_USE_HDF5=ON ',
+ '-DGDAL_USE_EXPAT=ON ',
+ '-DGDAL_USE_MYSQL=ON ',
+ '-DGDAL_USE_NETCDF=ON ',
+ '-DGDAL_USE_GEOTIFF=ON ',
+ '-DGDAL_USE_TIFF=ON ',
+ '-DGDAL_USE_NETCDF=ON ',
+ '-DGDAL_USE_SQLITE3=ON ',
+ '-DGDAL_USE_OPENJPEG=ON ',
+ '-DBUILD_PYTHON_BINDINGS=ON ',
+ '-DGDAL_USE_SPATIALITE=ON'])
+ # '--with-perl ',
+ # '--enable-shared ',
pisitools.cflags.add("-fno-strict-aliasing")
- autotools.configure("%s" % options_cfg)
+ cmaketools.configure("%s" % options_cfg)
# fix unused direct dependency analysis
- pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+ # pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
- autotools.make()
+ cmaketools.make()
# FIXME build man pages
#autotools.make("man")
# build python bindings
- shelltools.cd("swig/python")
- pythonmodules.compile()
+ # shelltools.cd("swig/python")
+ # python3modules.compile()
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
# install python bindings
- shelltools.cd("swig/python")
- pythonmodules.install()
- shelltools.cd("../..")
+ # shelltools.cd("swig/python")
+ # python3modules.install()
+ # shelltools.cd("../..")
- perlmodules.removePodfiles()
+ # perlmodules.removePodfiles()
# fix rpath
- shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/Const/Const.so" % get.installDIR())
- shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/GDAL.so" % get.installDIR())
- shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GNM/GNM.so" % get.installDIR())
- shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OSR/OSR.so" % get.installDIR())
- shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OGR/OGR.so" % get.installDIR())
+ # shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/Const/Const.so" % get.installDIR())
+ # shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GDAL/GDAL.so" % get.installDIR())
+ # shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/GNM/GNM.so" % get.installDIR())
+ # shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OSR/OSR.so" % get.installDIR())
+ # shelltools.system("chrpath -d %s/usr/lib/perl5/x86_64-linux-thread-multi/auto/Geo/OGR/OGR.so" % get.installDIR())
pisitools.dodoc("LICENSE*")
diff --git a/science/gis/gdal/pspec.xml b/science/gis/gdal/pspec.xml
index a36f11496e..770dddf7ea 100644
--- a/science/gis/gdal/pspec.xml
+++ b/science/gis/gdal/pspec.xml
@@ -13,7 +13,7 @@
library
A translator library for raster geospatial data formats (includes OGR support)
GDAL is a translator library for raster geospatial data formats which presents a single abstract data model to the calling application for all supported formats.
- http://download.osgeo.org/gdal/3.7.2/gdal-3.7.2.tar.gz
+ http://download.osgeo.org/gdal/3.7.3/gdal-3.7.3.tar.gz
curl-devel
hdf5-devel
@@ -28,8 +28,9 @@
libgeotiff-devel
libspatialite-devel
- python-devel
- python-setuptools
+ python3-devel
+ python3-build
+ python3-setuptools