CVS commit: pkgsrc/emulators/openmsx

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 16 16:50:51 UTC 2019

Modified Files:
        pkgsrc/emulators/openmsx: Makefile distinfo
Added Files:
        pkgsrc/emulators/openmsx/patches: patch-build_main.mk

Log Message:
openmsx: try a new workaround for it being picky about compilers.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/emulators/openmsx/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/openmsx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/openmsx/patches/patch-build_main.mk

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

Modified files:

Index: pkgsrc/emulators/openmsx/Makefile
diff -u pkgsrc/emulators/openmsx/Makefile:1.58 pkgsrc/emulators/openmsx/Makefile:1.59
--- pkgsrc/emulators/openmsx/Makefile:1.58      Mon Sep  2 13:19:59 2019
+++ pkgsrc/emulators/openmsx/Makefile   Wed Oct 16 16:50:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/09/02 13:19:59 adam Exp $
+# $NetBSD: Makefile,v 1.59 2019/10/16 16:50:51 nia Exp $
 
 DISTNAME=              openmsx-0.15.0
 CATEGORIES=            emulators
@@ -41,13 +41,7 @@ GCC_REQD+=   5
 .include "../../mk/bsd.prefs.mk"
 
 do-configure:
-.if !empty(PKGSRC_COMPILER:M*clang*)
-       cd ${WRKSRC} && ${CONFIGURE_ENV} \
-           ${GMAKE} -f build/main.mk probe CXX=clang++
-.else
-       cd ${WRKSRC} && ${CONFIGURE_ENV} \
-           ${GMAKE} -f build/main.mk probe CXX=g++
-.endif
+       cd ${WRKSRC} && ${CONFIGURE_ENV} ${GMAKE} -f build/main.mk probe
 
 post-extract:
        ${CP} ${WRKSRC}/build/platform-freebsd.mk \

Index: pkgsrc/emulators/openmsx/distinfo
diff -u pkgsrc/emulators/openmsx/distinfo:1.16 pkgsrc/emulators/openmsx/distinfo:1.17
--- pkgsrc/emulators/openmsx/distinfo:1.16      Mon Jun 17 15:16:28 2019
+++ pkgsrc/emulators/openmsx/distinfo   Wed Oct 16 16:50:51 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2019/06/17 15:16:28 nia Exp $
+$NetBSD: distinfo,v 1.17 2019/10/16 16:50:51 nia Exp $
 
 SHA1 (openmsx-0.15.0.tar.gz) = 401ba6fba73fa1527017f7d481727a4e58c69e2e
 RMD160 (openmsx-0.15.0.tar.gz) = 6a10d44d9e2f6f8ddf02fe43152cf6dfdc8d51ec
 SHA512 (openmsx-0.15.0.tar.gz) = b9647b740054090657b96084296b023fb21e2b8e365a167ddcfe1778469f52b0e223a00652343a9eb78df52d0c92f58942e2889d906b1c8b463dc424dbd721f3
 Size (openmsx-0.15.0.tar.gz) = 3748998 bytes
 SHA1 (patch-build_detectsys.py) = 597225fb5488cee98115659de726c828c5afdc4c
+SHA1 (patch-build_main.mk) = b523a4165413eaceaff18cf4ac096375e59ec902

Added files:

Index: pkgsrc/emulators/openmsx/patches/patch-build_main.mk
diff -u /dev/null pkgsrc/emulators/openmsx/patches/patch-build_main.mk:1.1
--- /dev/null   Wed Oct 16 16:50:51 2019
+++ pkgsrc/emulators/openmsx/patches/patch-build_main.mk        Wed Oct 16 16:50:51 2019
@@ -0,0 +1,28 @@
+$NetBSD: patch-build_main.mk,v 1.1 2019/10/16 16:50:51 nia Exp $
+
+Be less fussy about the name of the compiler executable.
+
+--- build/main.mk.orig 2018-12-08 22:45:38.000000000 +0000
++++ build/main.mk
+@@ -356,7 +356,6 @@ ifneq ($(filter %clang++,$(CXX))$(filter
+   CC:=$(subst clang++,clang,$(CXX))
+   DEPEND_FLAGS+=-MP
+ else
+-ifneq ($(filter %g++,$(CXX))$(filter g++%,$(CXX))$(findstring /g++-,$(CXX)),)
+   # Generic compilation flags.
+   COMPILE_FLAGS+=-pipe
+   # Enable C++11
+@@ -388,13 +387,6 @@ ifneq ($(filter %g++,$(CXX))$(filter g++
+   DEPEND_FLAGS+=-MP
+   # Plain C compiler, for the 3rd party libs.
+   CC:=$(subst g++,gcc,$(CXX))
+-else
+-  ifneq ($(filter %gcc,$(CXX))$(filter gcc%,$(CXX)),)
+-    $(error Set CXX to your "g++" executable instead of "gcc")
+-  else
+-    $(warning Unsupported compiler: $(CXX), please update Makefile)
+-  endif
+-endif
+ endif
+ 
+ # Strip binary?