Merge pull request #6499 from Rmys/master

ogdi

science/gis/gdal/actions.py

@@ -4,36 +4,87 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import autotools
-from pisi.actionsapi import shelltools
-from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
-
+from pisi.actionsapi import autotools
-WorkDir = "ogdi-ogdi_3_2_1"
+from pisi.actionsapi import pisitools
-
+from pisi.actionsapi import shelltools
-shelltools.export("TOPDIR", "%s/%s" % (get.workDIR(), WorkDir))
+from pisi.actionsapi import perlmodules
 
 def setup():
-    autotools.configure('--with-zlib \
+#    autotools.autoreconf("-vfi")
-                         --with-projlib="-L/usr/lib -lproj" \
+#    autotools.aclocal()
+    pisitools.cflags.add("-fno-strict-aliasing")
+
+    autotools.configure("--disable-static \
+                         --enable-shared \
+                         --datadir=/usr/share/gdal \
+                         --with-ogdi \
+                         --with-threads \
+                         --with-jasper \
+                         --with-odbc=/usr/lib/unixODBC \
                          --with-expat \
-                         --with-binconfigs')
+                         --with-cfitsio \
+                         --with-hdf5 \
+                         --with-netcdf \
+                         --with-png \
+                         --with-geos \
+                         --without-mysql \
+                         --with-curl \
+                         --with-perl \
+                         --with-jpeg \
+                         --with-jpeg12=no \
+                         --with-libtiff \
+                         --with-sqlite3 \
+                         --with-geotiff=external \
+                         --with-podofo \
+                         --with-spatialite \
+                         --with-ogr \
+                         --with-grib \
+                         --with-curl \
+                         --with-webp \
+                         --with-python \
+                         --without-poppler \
+                         --with-xerces \
+                         --with-openjpeg \
+                         --without-libtool \
+                         --without-hdf4 \
+                         --without-fme \
+                         --without-pcraster \
+                         --without-kakadu \
+                         --without-mrsid \
+                         --without-jp2mrsid \
+                         --without-msg \
+                         --without-bsb \
+                         --without-dods-root \
+                         --without-oci \
+                         --without-ingres \
+                         --without-spatialite \
+                         --without-dwgdirect \
+                         --without-epsilon \
+                         --without-idb \
+                         --without-sde \
+                         --mandir=/usr/share/man \
+                         --without-ruby")
+
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    
+    #for bug 13646
+    #pisitools.dosed("GDALmake.opt", "PY_HAVE_SETUPTOOLS=1 ", "PY_HAVE_SETUPTOOLS= ")
+    #pisitools.dosed("apps/GNUmakefile", "EXE_DEP_LIBS ", "KILL_EXE_DEP_LIBS ")
+    
+
 
 def build():
-    shelltools.export("TARGET", "Linux")
+    autotools.make()
-    shelltools.export("CFG", "release")
-    autotools.make("-j1")
 
 def install():
-    pisitools.dolib_so("bin/Linux/*.so")
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.dosym("/usr/lib/libogdi.so", "/usr/lib/libogdi.so.3")
+    #remove egg
+#    pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*")
 
-    for i in ["gltpd", "ogdi_import", "ogdi_info"]:
+    #pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3")
-        pisitools.dobin("bin/Linux/%s" % i)
+    #pisitools.removeDir("/usr/man/")
-    pisitools.dobin("ogdi-config")
+    #pisitools.domove("/usr/etc/bash_completion.d/*", "/etc/bash_completion.d")
+    #pisitools.removeDir("/usr/etc")
 
-    pisitools.insinto("/usr/lib/pkgconfig", "ogdi.pc")
+    perlmodules.removePodfiles()
-
-    pisitools.insinto("/usr/include", "ogdi/include/*.h")
-
-    pisitools.dodoc("ChangeLog", "NEWS", "README")

science/gis/ogdi/actions.py

@@ -9,7 +9,7 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "ogdi-3.2.0"
+WorkDir = "ogdi-ogdi_3_2_1"
 
 shelltools.export("TOPDIR", "%s/%s" % (get.workDIR(), WorkDir))