summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel de Val-Borro2016-06-02 15:14:52 -0400
committerMiguel de Val-Borro2016-06-02 15:14:52 -0400
commit33d3cc9096ce1baaa2f442e5718afbb2825b363c (patch)
tree82547f380efc0ce272365a754e70c04d775c92f4
parent0478455af944c339fb524eb107022f4d15d9bc0b (diff)
downloadaur-33d3cc9096ce1baaa2f442e5718afbb2825b363c.tar.gz
Fix compiling problem
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
-rw-r--r--gdl-template.patch20
3 files changed, 27 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2697dd4d5fa..9915e1f4e14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gnudatalanguage
pkgdesc = An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)
pkgver = 0.9.6
- pkgrel = 2
+ pkgrel = 3
url = http://gnudatalanguage.sourceforge.net/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 6f3db754530..aa5e27a60b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gnudatalanguage
pkgver=0.9.6
-pkgrel=2
+pkgrel=3
pkgdesc="An IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs)"
arch=('i686' 'x86_64')
url="http://gnudatalanguage.sourceforge.net/"
@@ -30,11 +30,14 @@ build() {
-DMAGICK=NO -DFFTW=YES -DHDF5=YES -DHDF=NO -DGRIB=YES -DUDUNITS=YES \
-DCMAKE_C_FLAGS="-I/usr/include/ImageMagick \
-I/usr/include/python2.7 \
- -I/usr/lib/python2.7/site-packages/numpy/core/include" ..
+ -I/usr/lib/python2.7/site-packages/numpy/core/include" ..\
+ -DHDF5=NO
make
}
package() {
- cd $srcdir/gdl-${pkgver}/build
+ cd $srcdir/gdl-${pkgver}/
+ patch -p1 < ../../gdl-template.patch
+ cd build
make DESTDIR=$pkgdir install
install -D -m755 ../../gdl.profile $pkgdir/etc/profile.d/gdl.sh
diff --git a/gdl-template.patch b/gdl-template.patch
new file mode 100644
index 00000000000..67610f194e8
--- /dev/null
+++ b/gdl-template.patch
@@ -0,0 +1,20 @@
+diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
+--- gdl-0.9.6/src/specializations.hpp.gcc6 2015-08-24 15:26:47.000000000 -0600
++++ gdl-0.9.6/src/specializations.hpp 2016-03-03 16:30:46.694379312 -0700
+@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
+
+ // default_io.cpp
+ template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_);
+-template<>
+-std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_);
+-template<>
+-std::istream& operator>>(std::istream& is, Data_<SpDString>& data_);
+-template<>
+ std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
+ template<>
+ std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);