From 29d3fa383035aa273b4d96abc386b0081607d99e Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 7 Feb 2019 22:23:15 +0000
Subject: [PATCH] libretro-mame: fix genie/glibc cross-compile issue

---
 packages/emulation/libretro-mame/package.mk       |  3 ++-
 .../patches/libretro-mame-0001-fix-makefile.patch | 14 --------------
 packages/emulation/libretro-mame2016/package.mk   |  3 ++-
 .../libretro-mame2016-01-crosscompile.patch       | 15 ---------------
 4 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch
 delete mode 100644 packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch

diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk
index 93bb19566f..eab96f4dec 100644
--- a/packages/emulation/libretro-mame/package.mk
+++ b/packages/emulation/libretro-mame/package.mk
@@ -29,7 +29,8 @@ make_target() {
 
   make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \
        LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="$ARCH" DISTRO="debian-stable" \
-       CC="$CC" CXX="$CXX" LD="$LD" CROSS_BUILD="" PTR64="$PTR64" TARGET="mame" \
+       CROSS_BUILD="1" OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" \
+       PTR64="$PTR64" TARGET="mame" \
        SUBTARGET="arcade" PLATFORM="$ARCH" RETRO=1 OSD="retro"
 }
 
diff --git a/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch b/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch
deleted file mode 100644
index 9bd7cd5bff..0000000000
--- a/packages/emulation/libretro-mame/patches/libretro-mame-0001-fix-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/3rdparty/genie/build/gmake.linux/genie.make b/3rdparty/genie/build/gmake.linux/genie.make
---- a/3rdparty/genie/build/gmake.linux/genie.make	2017-06-28 12:47:18.000000000 -0700
-+++ b/3rdparty/genie/build/gmake.linux/genie.make	2017-07-14 12:21:57.302218319 -0700
-@@ -28,10 +28,6 @@
-   RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
- endif
- 
--CC  = gcc
--CXX = g++
--AR  = ar
--
- ifndef RESCOMP
-   ifdef WINDRES
-     RESCOMP = $(WINDRES)
diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk
index 5d1b79170b..5d1f55e48b 100644
--- a/packages/emulation/libretro-mame2016/package.mk
+++ b/packages/emulation/libretro-mame2016/package.mk
@@ -23,7 +23,8 @@ make_target() {
 
   make REGENIE=1 VERBOSE=1 NOWERROR=1 PYTHON_EXECUTABLE=python2 CONFIG=libretro \
        LIBRETRO_OS="unix" ARCH="" PROJECT="" LIBRETRO_CPU="$ARCH" DISTRO="debian-stable" \
-       CC="$CC" CXX="$CXX" LD="$LD" CROSS_BUILD="" PTR64="$PTR64" TARGET="mame" \
+       CROSS_BUILD="1" OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" \
+       PTR64="$PTR64" TARGET="mame" \
        SUBTARGET="arcade" PLATFORM="$ARCH" RETRO=1 OSD="retro"
 }
 
diff --git a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch b/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch
deleted file mode 100644
index 6c59619723..0000000000
--- a/packages/emulation/libretro-mame2016/patches/libretro-mame2016-01-crosscompile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -336,9 +336,9 @@
- else
- PYTHON := $(PYTHON_EXECUTABLE)
- endif
--CC := $(SILENT)gcc
--LD := $(SILENT)g++
--CXX:= $(SILENT)g++
-+CC ?= $(SILENT)gcc
-+LD ?= $(SILENT)g++
-+CXX?= $(SILENT)g++
- 
- #-------------------------------------------------
- # specify OSD layer: windows, sdl, etc.