Final numpy patch

dl1ksv · dl1ksv · commit 3c77b92ace43 · 2015-07-16T17:54:41.000+02:00
diff --git a/recipes/numpy/patches/ar.patch b/recipes/numpy/patches/ar.patch
@@ -1,11 +1,11 @@
---- numpy/distutils/unixccompiler.orig.py	2015-02-01 17:38:21.000000000 +0100
-+++ numpy/distutils/unixccompiler.py	2015-07-08 17:21:05.742468485 +0200
+--- a/numpy/distutils/unixccompiler.py	2015-02-01 17:38:21.000000000 +0100
++++ b/numpy/distutils/unixccompiler.py	2015-07-08 17:21:05.742468485 +0200
 @@ -82,6 +82,8 @@
              pass
          self.mkpath(os.path.dirname(output_filename))
          tmp_objects = objects + self.objects
-+        self.archiver[0]="$AR"
-+        print("#####Archiver: " + ', '.join(self.archiver) ) 
++        from os import environ
++        self.archiver[0] = 'arm-linux-androideabi-ar'
          while tmp_objects:
              objects = tmp_objects[:50]
              tmp_objects = tmp_objects[50:]
diff --git a/recipes/numpy/patches/lib.patch b/recipes/numpy/patches/lib.patch
@@ -1,5 +1,5 @@
---- numpy/linalg/setup.orig.py	2015-07-09 14:15:59.850853336 +0200
-+++ numpy/linalg/setup.py	2015-07-09 14:21:59.403889000 +0200
+--- a/numpy/linalg/setup.py	2015-07-09 14:15:59.850853336 +0200
++++ b/numpy/linalg/setup.py	2015-07-09 14:21:59.403889000 +0200
 @@ -37,7 +37,8 @@
      config.add_extension('lapack_lite',
                           sources = [get_lapack_lite_sources],
@@ -19,8 +19,8 @@
                           )
  
      return config
---- numpy/fft/setup.orig.py	2015-07-09 14:35:22.299888028 +0200
-+++ numpy/fft/setup.py	2015-07-09 14:33:54.858392578 +0200
+--- a/numpy/fft/setup.py	2015-07-09 14:35:22.299888028 +0200
++++ b/numpy/fft/setup.py	2015-07-09 14:33:54.858392578 +0200
 @@ -9,7 +9,8 @@
  
      # Configure fftpack_lite
@@ -31,8 +31,8 @@
                           )
  
  
---- numpy/random/setup.orig.py	2015-07-09 14:44:41.105174826 +0200
-+++ numpy/random/setup.py	2015-07-09 14:46:08.592679877 +0200
+--- a/numpy/random/setup.orig.py	2015-07-09 14:44:41.105174826 +0200
++++ b/numpy/random/setup.py	2015-07-09 14:46:08.592679877 +0200
 @@ -38,7 +38,7 @@
      if needs_mingw_ftime_workaround():
          defs.append(("NPY_NEEDS_MINGW_TIME_WORKAROUND", None))
diff --git a/recipes/numpy/patches/prevent_libs_check.patch b/recipes/numpy/patches/prevent_libs_check.patch
@@ -0,0 +1,12 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index a050430..471e958 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -610,6 +610,7 @@ class system_info:
+         return self.get_paths(self.section, key)
+ 
+     def get_libs(self, key, default):
++        return []
+         try:
+             libs = self.cp.get(self.section, key)
+         except NoOptionError:
diff --git a/recipes/numpy/recipe.sh b/recipes/numpy/recipe.sh
@@ -15,8 +15,9 @@ function prebuild_numpy() {
 	fi
 
 	try patch -p1 < $RECIPE_numpy/patches/fix-numpy.patch
-	try patch -p0 < $RECIPE_numpy/patches/ar.patch
-	try patch -p0 < $RECIPE_numpy/patches/lib.patch
+	try patch -p1 < $RECIPE_numpy/patches/ar.patch
+	try patch -p1 < $RECIPE_numpy/patches/lib.patch
+	try patch -p1 < $RECIPE_numpy/patches/prevent_libs_check.patch
 	touch .patched
 }
 
