CVS commit: pkgsrc/emulators/libretro-picodrive

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug  8 23:47:49 UTC 2018

Modified Files:
        pkgsrc/emulators/libretro-picodrive: Makefile distinfo
        pkgsrc/emulators/libretro-picodrive/patches: patch-Makefile.libretro

Log Message:
emulators/libretro-picodrive: add a patch to stop the makefile overriding CC.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-picodrive/Makefile \
    pkgsrc/emulators/libretro-picodrive/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/libretro-picodrive/Makefile
diff -u pkgsrc/emulators/libretro-picodrive/Makefile:1.3 pkgsrc/emulators/libretro-picodrive/Makefile:1.4
--- pkgsrc/emulators/libretro-picodrive/Makefile:1.3    Wed Aug  8 22:14:20 2018
+++ pkgsrc/emulators/libretro-picodrive/Makefile        Wed Aug  8 23:47:49 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2018/08/08 22:14:20 nia Exp $
+# $NetBSD: Makefile,v 1.4 2018/08/08 23:47:49 nia Exp $
 
 DISTNAME=      libretro-picodrive-20180722
+PKGREVISION=   1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/}
 GITHUB_PROJECT=        picodrive
Index: pkgsrc/emulators/libretro-picodrive/distinfo
diff -u pkgsrc/emulators/libretro-picodrive/distinfo:1.3 pkgsrc/emulators/libretro-picodrive/distinfo:1.4
--- pkgsrc/emulators/libretro-picodrive/distinfo:1.3    Wed Aug  8 22:14:20 2018
+++ pkgsrc/emulators/libretro-picodrive/distinfo        Wed Aug  8 23:47:49 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/08/08 22:14:20 nia Exp $
+$NetBSD: distinfo,v 1.4 2018/08/08 23:47:49 nia Exp $
 
 SHA1 (libretro-picodrive-20180722-2db90628f5f29f1d4030172ce4f57ab757fa9d93.tar.gz) = 61b5269de3b1f36f22f13f4d2626bf5bd25b2690
 RMD160 (libretro-picodrive-20180722-2db90628f5f29f1d4030172ce4f57ab757fa9d93.tar.gz) = 40a1b55c0e3f96cdf84aca88b03e4e2492915dea
 SHA512 (libretro-picodrive-20180722-2db90628f5f29f1d4030172ce4f57ab757fa9d93.tar.gz) = 
3241fd627a2a506f2e01241a2cef0635dc2efb1598a8c538809f7c104b3de20629b76342a2223bcff958def5cf71b1da5cc0f136879374339a1067170439035c
 Size (libretro-picodrive-20180722-2db90628f5f29f1d4030172ce4f57ab757fa9d93.tar.gz) = 1411113 bytes
-SHA1 (patch-Makefile.libretro) = 883b434e5c549d3ae855162ed8f5b3ff0bed9c7e
+SHA1 (patch-Makefile.libretro) = 466689dd6ea1de117f2e70e8811b37fb1013a751

Index: pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro
diff -u pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro:1.1 pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro:1.2
--- pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro:1.1     Wed Aug  8 22:14:20 2018
+++ pkgsrc/emulators/libretro-picodrive/patches/patch-Makefile.libretro Wed Aug  8 23:47:49 2018
@@ -1,11 +1,23 @@
-$NetBSD: patch-Makefile.libretro,v 1.1 2018/08/08 22:14:20 nia Exp $
+$NetBSD: patch-Makefile.libretro,v 1.2 2018/08/08 23:47:49 nia Exp $
+
+Don't redefine CC.
 
 Picodrive is written in C. Let's link with a C compiler instead of
 a C++ compiler.
 
 --- Makefile.libretro.orig     2018-07-22 20:01:05.000000000 +0000
 +++ Makefile.libretro
-@@ -656,7 +656,7 @@ else
+@@ -68,9 +68,6 @@ ifeq ($(platform), unix)
+       DONT_COMPILE_IN_ZLIB = 1
+       CFLAGS += -DFAMEC_NO_GOTOS
+       use_sh2drc = 1
+-ifneq ($(findstring SunOS,$(shell uname -a)),)
+-      CC=gcc
+-endif
+ 
+ # Portable Linux
+ else ifeq ($(platform), linux-portable)
+@@ -656,7 +653,7 @@ else
        LD = link.exe
  endif
  else