[oe-commits] [openembedded-core] 36/76: python-numpy: Use MIPS MACHINE_OVERRIDES to reduce duplication

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a48dbddab9524e78eeac53484d9dbfa0b484c561
Author: Zubair Lutfullah Kakakhel <Zubair.Kakakhel at imgtec.com>
AuthorDate: Wed Nov 23 13:47:30 2016 +0000

    python-numpy: Use MIPS MACHINE_OVERRIDES to reduce duplication
    
    The mipsarch* MACHINE_OVERRIDES can be used to pass the same
    parameters to MIPS pre-R2 and R6 ISA variants.
    
    Use them to reduce duplication in supporting MIPS R6 ISA.
    
    Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel at imgtec.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../files/{mips64n32 => mipsarchn32eb}/_numpyconfig.h    |  0
 .../files/{mips64n32 => mipsarchn32eb}/config.h          |  0
 .../files/{mips64n32 => mipsarchn32el}/_numpyconfig.h    |  0
 .../files/{mips64n32 => mipsarchn32el}/config.h          |  1 -
 .../files/{mips64 => mipsarchn64eb}/_numpyconfig.h       |  0
 .../files/{mips64 => mipsarchn64eb}/config.h             |  0
 .../files/{mips64 => mipsarchn64el}/_numpyconfig.h       |  0
 .../files/{mips64n32 => mipsarchn64el}/config.h          |  1 -
 .../files/{mips => mipsarcho32eb}/_numpyconfig.h         |  0
 .../python-numpy/files/{mips => mipsarcho32eb}/config.h  |  0
 .../files/{mipsel => mipsarcho32el}/config.h             |  0
 .../files/{mipsel => mipsarcho32el}/numpyconfig.h        |  0
 .../recipes-devtools/python-numpy/python-numpy_1.11.2.bb | 16 ++++++++++++----
 .../python-numpy/python3-numpy_1.11.2.bb                 | 16 ++++++++++++----
 14 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
similarity index 100%
copy from meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h
copy to meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
similarity index 100%
copy from meta/recipes-devtools/python-numpy/files/mips64n32/config.h
copy to meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
similarity index 99%
copy from meta/recipes-devtools/python-numpy/files/mips64n32/config.h
copy to meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
index c30b868..4872703 100644
--- a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
@@ -1,4 +1,3 @@
-#define HAVE_ENDIAN_H 1
 #define SIZEOF_PY_INTPTR_T 8
 #define SIZEOF_PY_LONG_LONG 8
 #define MATHLIB m
diff --git a/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
similarity index 100%
copy from meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h
copy to meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
similarity index 99%
rename from meta/recipes-devtools/python-numpy/files/mips64n32/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
index c30b868..4872703 100644
--- a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
@@ -1,4 +1,3 @@
-#define HAVE_ENDIAN_H 1
 #define SIZEOF_PY_INTPTR_T 8
 #define SIZEOF_PY_LONG_LONG 8
 #define MATHLIB m
diff --git a/meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mipsel/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
index dafd7e2..c4bc354 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
@@ -26,7 +26,7 @@ CONFIGFILESURI_armeb = " \
     file://config.h \
     file://numpyconfig.h \
 "
-CONFIGFILESURI_mipsel = " \
+CONFIGFILESURI_mipsarcho32el = " \
     file://config.h \
     file://numpyconfig.h \
 "
@@ -38,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips = " \
+CONFIGFILESURI_mipsarcho32eb = " \
     file://config.h \
     file://_numpyconfig.h \
 "
@@ -50,11 +50,19 @@ CONFIGFILESURI_powerpc64 = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips64 = " \
+CONFIGFILESURI_mipsarchn64eb = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips64n32 = " \
+CONFIGFILESURI_mipsarchn64el = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32eb = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32el = " \
     file://config.h \
     file://_numpyconfig.h \
 "
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
index c34df6f..d5fe50c 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
@@ -26,7 +26,7 @@ CONFIGFILESURI_armeb = " \
     file://config.h \
     file://numpyconfig.h \
 "
-CONFIGFILESURI_mipsel = " \
+CONFIGFILESURI_mipsarcho32el = " \
     file://config.h \
     file://numpyconfig.h \
 "
@@ -38,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips = " \
+CONFIGFILESURI_mipsarcho32eb = " \
     file://config.h \
     file://_numpyconfig.h \
 "
@@ -50,11 +50,19 @@ CONFIGFILESURI_powerpc64 = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips64 = " \
+CONFIGFILESURI_mipsarchn64eb = " \
     file://config.h \
     file://_numpyconfig.h \
 "
-CONFIGFILESURI_mips64n32 = " \
+CONFIGFILESURI_mipsarchn64el = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32eb = " \
+    file://config.h \
+    file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32el = " \
     file://config.h \
     file://_numpyconfig.h \
 "

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.