diff options
| author | nia <nia@pkgsrc.org> | 2019-10-16 16:50:51 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-10-16 16:50:51 +0000 |
| commit | 385df442ababf59098567af326042bb96b36ef0f (patch) | |
| tree | 098165b07047cae8f93e94f6d44f31878b31b451 /emulators/openmsx | |
| parent | d4db67ddd839ad8ccc96452983b2471edd800775 (diff) | |
| download | pkgsrc-385df442ababf59098567af326042bb96b36ef0f.tar.gz | |
openmsx: try a new workaround for it being picky about compilers.
Diffstat (limited to 'emulators/openmsx')
| -rw-r--r-- | emulators/openmsx/Makefile | 10 | ||||
| -rw-r--r-- | emulators/openmsx/distinfo | 3 | ||||
| -rw-r--r-- | emulators/openmsx/patches/patch-build_main.mk | 28 |
3 files changed, 32 insertions, 9 deletions
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile index 3adffc0c505..82c98c5b1b1 100644 --- a/emulators/openmsx/Makefile +++ b/emulators/openmsx/Makefile @@ -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 \ diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo index 5fc1d9021e1..693f81e26d8 100644 --- a/emulators/openmsx/distinfo +++ b/emulators/openmsx/distinfo @@ -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 diff --git a/emulators/openmsx/patches/patch-build_main.mk b/emulators/openmsx/patches/patch-build_main.mk new file mode 100644 index 00000000000..a791a0d26e0 --- /dev/null +++ b/emulators/openmsx/patches/patch-build_main.mk @@ -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? |