Numpy build string.

SciTools · Oct 14, 2015 · 59f86ca · 59f86ca
1 parent 33dc413
commit 59f86ca
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/cartopy/meta.yaml b/cartopy/meta.yaml
@@ -1,16 +1,20 @@
+{%set build = 2 %}
+{%set version = "0.13.0" %}
+
 package:
   name: cartopy
-  version: 0.13.0
+  version: {{version}}
 
 source:
   git_url: https://github.com/SciTools/cartopy.git
-  git_tag: v0.13.0
+  git_tag: v{{version}}
 
   patches:
     - cartopy.win.patch  # [win]
 
 build:
-  number: 2
+  number: {{build}}
+  string: np{{np}}py{{py}}_{{build}}
 
 requirements:
   build:

diff --git a/proj.4/build.sh b/proj.4/build.sh
@@ -3,9 +3,5 @@
 ./configure --prefix=$PREFIX --without-jni
 
 make
-
-if [[ $(uname) == Linux ]]; then
-    make check
-fi
-
+make check
 make install
diff --git a/proj.4/make_check.patch b/proj.4/make_check.patch
@@ -0,0 +1,11 @@
+--- src/rtodms.c	2015-02-25 00:38:48.000000000 -0300
++++ src/rtodms.c	2015-10-14 18:47:05.298010308 -0300
+@@ -63,7 +63,7 @@
+ 		if (*p != '.')
+ 			++p;
+ 		if (++q != p)
+-			(void)strcpy(p, q);
++			(void)memmove(p, q, (sign ? 3 : 2));
+ 	} else if (min)
+ 		(void)sprintf(ss,"%dd%d'%c",deg,min,sign);
+ 	else
diff --git a/proj.4/meta.yaml b/proj.4/meta.yaml
@@ -6,6 +6,8 @@ source:
     fn:  proj-4.9.1.tar.gz
     url: http://download.osgeo.org/proj/proj-4.9.1.tar.gz
     md5: 3cbb2a964fd19a496f5f4265a717d31c
+    patches:
+        - make_check.patch  # [osx]
 
 build:
     number: 1