[mupen64plus] 111/262: Define wordsize and endianess of architectures supported by debian

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:23 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 52ee63e0eee1e019838349c26ac3cbf1daa1e9ac
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 2 12:34:44 2009 +0200

    Define wordsize and endianess of architectures supported by debian
---
 debian/changelog                      |   3 +
 debian/patches/119-debian-archs.patch | 195 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |   1 +
 3 files changed, 199 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d02d6bc..bfbbcc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mupen64plus (1.5+dfsg1-3) UNRELEASED; urgency=low
   * debian/rules:
     - Set host architecture to support build of i386 running on x86_64 kernel
       (Closes: #544670)
+  * debian/patches:
+    - Add 119-debian-archs.patch, Define wordsize and endianess of
+      architectures supported by debian (Closes: #544673)
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Wed, 02 Sep 2009 10:57:51 +0200
 
diff --git a/debian/patches/119-debian-archs.patch b/debian/patches/119-debian-archs.patch
new file mode 100644
index 0000000..f5f4ba8
--- /dev/null
+++ b/debian/patches/119-debian-archs.patch
@@ -0,0 +1,195 @@
+From 452bc9f54ab0c483c8c15e8854423686f903fef7 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
+
+mupen64plus must exactly know for which architectures it is build and
+which word size and endianess it has. Most architectures supported
+by debian weren't listed here. That means that the build would
+probably fail or generate unusable binaries.
+To better support unknown architectures NO_ASM must be enabled by
+default and known good architectures can then override this value. The
+user can still force to change that behavior by NO_ASM=0 or NO_ASM=1
+on the commandline.
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ pre.mk |  147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 131 insertions(+), 16 deletions(-)
+
+diff --git a/pre.mk b/pre.mk
+index 5c7b73c..e4569e2 100644
+--- a/pre.mk
++++ b/pre.mk
+@@ -19,29 +19,141 @@
+ # *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
+ # * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+-# detect system architecture: i386, x86_64, or PPC/PPC64
++# detect system architecture: i386, x86_64, PPC/PPC64, ALPHA, ARM, AVR32, HPPA,
++# IA64, M32R, M68K, MIPS, S390, SH3, SH4, SPARC
+ UNAME = $(shell uname -m)
++NO_ASM ?= 1
+ ifeq ("$(UNAME)","x86_64")
+-  CPU = X86
++  CPU := X86
+   ifeq ("$(BITS)", "32")
+-    ARCH = 64BITS_32
++    ARCH := 64BITS_32
+   else
+-    ARCH = 64BITS
++    ARCH := 64BITS
+   endif
++  NO_ASM := 0
++  CPU_ENDIANESS := LITTLE
+ endif
+-ifneq ("$(filter i%86,$(UNAME))","")
+-  CPU = X86
+-  ARCH = 32BITS
++ifneq ("$(filter pentium i%86,$(UNAME))","")
++  CPU := X86
++  ARCH := 32BITS
++  NO_ASM := 0
++  CPU_ENDIANESS := LITTLE
+ endif
+-ifeq ("$(UNAME)","ppc")
+-  CPU = PPC
+-  ARCH = 32BITS
+-  NO_ASM = 1
++ifneq ("$(filter ppc powerpc,$(UNAME))","")
++  CPU := PPC
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
+ endif
+-ifeq ("$(UNAME)","ppc64")
+-  CPU = PPC
+-  ARCH = 64BITS
+-  NO_ASM = 1
++ifneq ("$(filter ppc64 powerpc64,$(UNAME))","")
++  CPU := PPC
++  ARCH := 64BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifneq ("$(filter alpha%,$(UNAME))","")
++  CPU := ALPHA
++  ARCH := 64BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := LITTLE
++endif
++ifneq ("$(filter arm%b,$(UNAME))","")
++  CPU := ARM
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++else
++ifneq ("$(filter arm%b,$(UNAME))","")
++arm		arm.*
++  CPU := ARM
++  ARCH := 32BITS
++  NO_ASM := 1
++  LITTLE
++endif
++endif
++ifneq ("$(filter hppa%b,$(UNAME))","")
++  CPU := HPPA
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","ia64")
++  CPU := IA64
++  ARCH := 64BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := LITTLE
++endif
++ifeq ("$(UNAME)","avr32")
++  CPU := AVR32
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","m32r")
++  CPU := M32R
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","m68k")
++  CPU := M68K
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifneq ("$(filter mips mipseb,$(UNAME))","")
++  CPU := MIPS
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","mipsel")
++  CPU := MIPS
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := LITTLE
++endif
++ifeq ("$(UNAME)","s390")
++  CPU := S390
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","s390x")
++  CPU := S390
++  ARCH := 64BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","sh3")
++  CPU := SH3
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := LITTLE
++endif
++ifeq ("$(UNAME)","sh3eb")
++  CPU := SH3
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","sh4")
++  CPU := SH4
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := LITTLE
++endif
++ifeq ("$(UNAME)","sh4eb")
++  CPU := SH4
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
++endif
++ifeq ("$(UNAME)","sparc")
++  CPU := SPARC
++  ARCH := 32BITS
++  NO_ASM := 1
++  CPU_ENDIANESS := BIG
+ endif
+ 
+ # detect operation system. Currently just linux and OSX.
+@@ -214,7 +326,10 @@ ifeq ($(CPU), X86)
+   endif
+ endif
+ ifeq ($(CPU), PPC)
+-  CFLAGS += -mcpu=powerpc -D_BIG_ENDIAN
++  CFLAGS += -mcpu=powerpc
++endif
++ifeq ($(CPU_ENDIANESS), BIG)
++  CFLAGS += -D_BIG_ENDIAN
+ endif
+ 
+ # set CFLAGS, LIBS, and LDFLAGS for external dependencies
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index bd8c50e..0b8d650 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 116-ftbfs-dynarec.patch
 117-ftbfs-kfreebsd.patch
 118-ftbfs-debugger.patch
+119-debian-archs.patch

-- 
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