Page MenuHomeSolus
Files F9774

0001-Rebuild-fixing-python-gdal.patch
mmeinert (Michael Meinertzhagen)
Actions

Authored By
mmeinert
Jan 7 2017, 5:35 PM
Size
7 KB
Referenced Files
None
Subscribers
None

0001-Rebuild-fixing-python-gdal.patch
View Options

From eeb9a12812a3059ee66e04b528288217bab3ff5c Mon Sep 17 00:00:00 2001
From: Michael Meinertzhagen <mmeinert@protonmail.com>
Date: Sat, 7 Jan 2017 18:31:16 +0100
Subject: [PATCH 1/1] Rebuild fixing python-gdal
---
files/0001-fix-build-with-python.patch | 24 ++++++++++++++++++
package.yml | 13 +++++++---
pspec_x86_64.xml | 45 +++++++++++++++++++++++++++++-----
3 files changed, 72 insertions(+), 10 deletions(-)
create mode 100644 files/0001-fix-build-with-python.patch
diff --git a/files/0001-fix-build-with-python.patch b/files/0001-fix-build-with-python.patch
new file mode 100644
index 0000000..629952a
--- /dev/null
+++ b/files/0001-fix-build-with-python.patch
@@ -0,0 +1,24 @@
+diff --git a/swig/python/setup.py b/swig/python/setup.py
+index e072cd1..a2468bf 100644
+--- a/swig/python/setup.py
++++ b/swig/python/setup.py
+@@ -14,6 +14,19 @@
+
+ from glob import glob
+
++# If CXX is defined in the environment, it will be used to link the .so
++# but distutils will be confused if it is made of several words like 'ccache g++'
++# and it will try to use only the first word.
++# See https://lists.osgeo.org/pipermail/gdal-dev/2016-July/044686.html
++# Note: in general when doing "make", CXX will not be defined, unless it is defined as
++# an environment variable, but in that case it is the value of GDALmake.opt that
++# will be set, not the one from the environment that started "make" !
++# If no CXX environment variable is defined, then the value of the CXX variable
++# in GDALmake.opt will not be set as an environment variable
++if 'CXX' in os.environ and os.environ['CXX'].strip().find(' ') >= 0:
++ print('WARNING: "CXX=%s" was defined in the environment and contains more than one word. Unsetting it since that is incompatible of distutils' % os.environ['CXX'])
++ del os.environ['CXX']
++
+ # ---------------------------------------------------------------------------
+ # Switches
+ # ---------------------------------------------------------------------------
diff --git a/package.yml b/package.yml
index 737f6bb..225653f 100644
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : gdal
version : 2.1.2
-release : 2
+release : 3
source :
- http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.xz : b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374
license : MIT
@@ -20,10 +20,15 @@ builddeps :
- giflib-devel
- hdf5-devel
- libjpeg-turbo-devel
+ - numpy
setup : |
- %configure --disable-static \
- --datadir=/usr/share/gdal \
- --with-liblzma=yes
+ %patch -p1 < $pkgfiles/0001-fix-build-with-python.patch
+ %configure --datadir=/usr/share/gdal \
+ --with-liblzma=yes \
+ --with-geos \
+ --with-python \
+ --with-png \
+ --with-xerces-c
build : |
%make
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
index 75f3e9a..eed03a2 100644
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>gdal</Name>
<Packager>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Michael Meinertzhagen</Name>
+ <Email>mmeinert@protonmail.com</Email>
</Packager>
<License>MIT</License>
<PartOf>programming</PartOf>
@@ -20,6 +20,38 @@
<PartOf>programming</PartOf>
<Files>
<Path fileType="executable">/usr/bin</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/GDAL-2.1.2-py2.7.egg-info</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdal.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdal.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdalconst.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdalconst.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdalnumeric.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/gdalnumeric.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/ogr.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/ogr.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/__init__.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/_gdal.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/_gdal_array.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/_gdalconst.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/_ogr.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/_osr.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdal.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdal.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdal_array.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdal_array.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdalconst.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdalconst.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdalnumeric.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gdalnumeric.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gnm.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/gnm.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/ogr.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/ogr.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/osr.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osgeo/osr.pyc</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osr.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/osr.pyc</Path>
<Path fileType="library">/usr/lib64/gdalplugins</Path>
<Path fileType="library">/usr/lib64/lib*.so.*</Path>
<Path fileType="data">/usr/share/bash-completion/gdal</Path>
@@ -56,21 +88,22 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="2">gdal</Dependency>
+ <Dependency release="3">gdal</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
+ <Path fileType="library">/usr/lib64/lib*.a</Path>
<Path fileType="library">/usr/lib64/lib*.so</Path>
<Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
</Files>
</Package>
<History>
- <Update release="2">
+ <Update release="3">
- <Date>2016-11-22</Date>
+ <Date>2017-01-07</Date>
<Version>2.1.2</Version>
<Comment>Packaging update</Comment>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Michael Meinertzhagen</Name>
+ <Email>mmeinert@protonmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
--
2.11.0

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6069
Default Alt Text
0001-Rebuild-fixing-python-gdal.patch (7 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.