[mupen64plus] 114/262: Fix detection of armel as cpu architecture

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:24 UTC 2015


This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 81344811391bc306eed4aad0c66f2facd2b7b61b
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 2 13:10:31 2009 +0200

    Fix detection of armel as cpu architecture
---
 debian/patches/119-debian-archs.patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/patches/119-debian-archs.patch b/debian/patches/119-debian-archs.patch
index f5f4ba8..f22278b 100644
--- a/debian/patches/119-debian-archs.patch
+++ b/debian/patches/119-debian-archs.patch
@@ -1,4 +1,4 @@
-From 452bc9f54ab0c483c8c15e8854423686f903fef7 Mon Sep 17 00:00:00 2001
+From d5bcb98e1b2a0556a2a26d72dc1eee9e0ac301a3 Mon Sep 17 00:00:00 2001
 From: Sven Eckelmann <sven.eckelmann at gmx.de>
 Date: Wed, 2 Sep 2009 12:26:37 +0200
 Subject: [PATCH] Define new cpu architectures
@@ -14,14 +14,14 @@ on the commandline.
 
 Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
 ---
- pre.mk |  147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
- 1 files changed, 131 insertions(+), 16 deletions(-)
+ pre.mk |  146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 130 insertions(+), 16 deletions(-)
 
 diff --git a/pre.mk b/pre.mk
-index 5c7b73c..e4569e2 100644
+index 5c7b73c..3a2e537 100644
 --- a/pre.mk
 +++ b/pre.mk
-@@ -19,29 +19,141 @@
+@@ -19,29 +19,140 @@
  # *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  # * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
@@ -84,8 +84,7 @@ index 5c7b73c..e4569e2 100644
 +  NO_ASM := 1
 +  CPU_ENDIANESS := BIG
 +else
-+ifneq ("$(filter arm%b,$(UNAME))","")
-+arm		arm.*
++ifneq ("$(filter arm%,$(UNAME))","")
 +  CPU := ARM
 +  ARCH := 32BITS
 +  NO_ASM := 1
@@ -178,7 +177,7 @@ index 5c7b73c..e4569e2 100644
  endif
  
  # detect operation system. Currently just linux and OSX.
-@@ -214,7 +326,10 @@ ifeq ($(CPU), X86)
+@@ -214,7 +325,10 @@ ifeq ($(CPU), X86)
    endif
  endif
  ifeq ($(CPU), PPC)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git



More information about the Pkg-games-commits mailing list