From 4f1dec57ba54f4f04c9bb47125ffce7dbd3ea559 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 9 Oct 2021 18:58:51 +0200 Subject: [PATCH] libretro-mame2010: update cross build patch Signed-off-by: Matthias Reichl --- .../libretro-mame2010-0001_fix-cross-build.patch | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch b/packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch index e46f5da39f..d158cf0413 100644 --- a/packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch +++ b/packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index e55363d..2ce19e0 100644 +index 65ece36..bd7d670 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ COBJFLAGS = @@ -11,7 +11,7 @@ index e55363d..2ce19e0 100644 LDFLAGSEMULATOR = GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)" -@@ -104,24 +104,22 @@ ifeq ($(VRENDER),opengl) +@@ -104,27 +104,25 @@ ifeq ($(VRENDER),opengl) CCOMFLAGS += -DHAVE_OPENGL endif @@ -32,6 +32,10 @@ index e55363d..2ce19e0 100644 ifneq (,$(findstring mingw64-w64,$(PATH))) PTR64 ?= 1 endif +-ifeq ($(firstword $(filter arm64,$(UNAME))),arm64) ++ifeq ($(firstword $(filter arm64,$(ARCH))),arm64) + PTR64 ?= 1 + endif -ifneq (,$(findstring Power,$(UNAME))) +ifneq (,$(findstring Power,$(ARCH))) BIGENDIAN=1 @@ -41,7 +45,7 @@ index e55363d..2ce19e0 100644 BIGENDIAN=1 endif -@@ -143,14 +141,10 @@ ifeq ($(VRENDER),opengl) +@@ -146,14 +144,10 @@ ifeq ($(VRENDER),opengl) LIBS += -lGL endif LDFLAGS += $(SHARED) @@ -60,7 +64,7 @@ index e55363d..2ce19e0 100644 CCOMFLAGS += $(PLATCFLAGS) -ffast-math LIBS += -lstdc++ -lpthread -@@ -433,10 +427,13 @@ else ifneq (,$(findstring rpi,$(platform))) +@@ -462,10 +456,13 @@ else ifneq (,$(findstring rpi,$(platform))) # ARM else ifneq (,$(findstring armv,$(platform))) @@ -76,7 +80,7 @@ index e55363d..2ce19e0 100644 LDFLAGS += $(SHARED) ARM_ENABLED = 1 X86_SH2DRC = 0 -@@ -655,7 +652,7 @@ DEFS += -DFLAC__NO_DLL +@@ -683,7 +680,7 @@ DEFS += -DFLAC__NO_DLL # CFLAGS is defined based on C or C++ targets # (remember, expansion only happens when used, so doing it here is ok)