Wed Oct 16 16:50:51 2019 UTC ()
openmsx: try a new workaround for it being picky about compilers.


(nia)
diff -r1.58 -r1.59 pkgsrc/emulators/openmsx/Makefile
diff -r1.16 -r1.17 pkgsrc/emulators/openmsx/distinfo
diff -r0 -r1.1 pkgsrc/emulators/openmsx/patches/patch-build_main.mk
cvs diff -r1.58 -r1.59 pkgsrc/emulators/openmsx/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/openmsx/Makefile 2019/09/02 13:19:59 1.58
+++ pkgsrc/emulators/openmsx/Makefile 2019/10/16 16:50:51 1.59
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.58 2019/09/02 13:19:59 adam Exp $ 1# $NetBSD: Makefile,v 1.59 2019/10/16 16:50:51 nia Exp $
2 2
3DISTNAME= openmsx-0.15.0 3DISTNAME= openmsx-0.15.0
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=openMSX/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=openMSX/}
6GITHUB_PROJECT= openMSX 6GITHUB_PROJECT= openMSX
7GITHUB_RELEASE= RELEASE_0_15_0 7GITHUB_RELEASE= RELEASE_0_15_0
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://openmsx.org/ 10HOMEPAGE= https://openmsx.org/
11COMMENT= MSX emulator that aims for perfection 11COMMENT= MSX emulator that aims for perfection
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
@@ -31,33 +31,27 @@ SUBST_STAGE.bswap= pre-configure @@ -31,33 +31,27 @@ SUBST_STAGE.bswap= pre-configure
31SUBST_MESSAGE.bswap= Do not conflict bswap functions. 31SUBST_MESSAGE.bswap= Do not conflict bswap functions.
32SUBST_FILES.bswap= src/utils/endian.hh 32SUBST_FILES.bswap= src/utils/endian.hh
33SUBST_FILES.bswap+= src/utils/sha1.cc 33SUBST_FILES.bswap+= src/utils/sha1.cc
34SUBST_FILES.bswap+= src/utils/tiger.cc 34SUBST_FILES.bswap+= src/utils/tiger.cc
35SUBST_SED.bswap= -e 's, bswap, openmsx_bswap,g' 35SUBST_SED.bswap= -e 's, bswap, openmsx_bswap,g'
36SUBST_SED.bswap+= -e 's,::bswap,::openmsx_bswap,g' 36SUBST_SED.bswap+= -e 's,::bswap,::openmsx_bswap,g'
37 37
38# c++14 38# c++14
39GCC_REQD+= 5 39GCC_REQD+= 5
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
43do-configure: 43do-configure:
44.if !empty(PKGSRC_COMPILER:M*clang*) 44 cd ${WRKSRC} && ${CONFIGURE_ENV} ${GMAKE} -f build/main.mk probe
45 cd ${WRKSRC} && ${CONFIGURE_ENV} \ 
46 ${GMAKE} -f build/main.mk probe CXX=clang++ 
47.else 
48 cd ${WRKSRC} && ${CONFIGURE_ENV} \ 
49 ${GMAKE} -f build/main.mk probe CXX=g++ 
50.endif 
51 45
52post-extract: 46post-extract:
53 ${CP} ${WRKSRC}/build/platform-freebsd.mk \ 47 ${CP} ${WRKSRC}/build/platform-freebsd.mk \
54 ${WRKSRC}/build/platform-dragonfly.mk 48 ${WRKSRC}/build/platform-dragonfly.mk
55 49
56post-build: 50post-build:
57 ( \ 51 ( \
58 ${ECHO} "#!${SH}"; \ 52 ${ECHO} "#!${SH}"; \
59 ${ECHO} 'exec ${PREFIX}/openmsx/bin/openmsx $$@' \ 53 ${ECHO} 'exec ${PREFIX}/openmsx/bin/openmsx $$@' \
60 ) > ${WRKSRC}/openmsx.sh 54 ) > ${WRKSRC}/openmsx.sh
61 55
62post-install: 56post-install:
63 ${INSTALL_SCRIPT} ${WRKSRC}/openmsx.sh ${DESTDIR}${PREFIX}/bin/openmsx 57 ${INSTALL_SCRIPT} ${WRKSRC}/openmsx.sh ${DESTDIR}${PREFIX}/bin/openmsx
cvs diff -r1.16 -r1.17 pkgsrc/emulators/openmsx/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/openmsx/distinfo 2019/06/17 15:16:28 1.16
+++ pkgsrc/emulators/openmsx/distinfo 2019/10/16 16:50:51 1.17
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.16 2019/06/17 15:16:28 nia Exp $ 1$NetBSD: distinfo,v 1.17 2019/10/16 16:50:51 nia Exp $
2 2
3SHA1 (openmsx-0.15.0.tar.gz) = 401ba6fba73fa1527017f7d481727a4e58c69e2e 3SHA1 (openmsx-0.15.0.tar.gz) = 401ba6fba73fa1527017f7d481727a4e58c69e2e
4RMD160 (openmsx-0.15.0.tar.gz) = 6a10d44d9e2f6f8ddf02fe43152cf6dfdc8d51ec 4RMD160 (openmsx-0.15.0.tar.gz) = 6a10d44d9e2f6f8ddf02fe43152cf6dfdc8d51ec
5SHA512 (openmsx-0.15.0.tar.gz) = b9647b740054090657b96084296b023fb21e2b8e365a167ddcfe1778469f52b0e223a00652343a9eb78df52d0c92f58942e2889d906b1c8b463dc424dbd721f3 5SHA512 (openmsx-0.15.0.tar.gz) = b9647b740054090657b96084296b023fb21e2b8e365a167ddcfe1778469f52b0e223a00652343a9eb78df52d0c92f58942e2889d906b1c8b463dc424dbd721f3
6Size (openmsx-0.15.0.tar.gz) = 3748998 bytes 6Size (openmsx-0.15.0.tar.gz) = 3748998 bytes
7SHA1 (patch-build_detectsys.py) = 597225fb5488cee98115659de726c828c5afdc4c 7SHA1 (patch-build_detectsys.py) = 597225fb5488cee98115659de726c828c5afdc4c
 8SHA1 (patch-build_main.mk) = b523a4165413eaceaff18cf4ac096375e59ec902
File Added: pkgsrc/emulators/openmsx/patches/Attic/patch-build_main.mk
$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?