cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unhardcode g++ in nethack,qt

Browse Source
This commit is contained in:
espie 2017-03-04 12:42:04 +00:00
parent f22da3d348
commit c39ed7aa4a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/nethack/files/qt-config
View File

@ -9,4 +9,4 @@ WINSRC = $(WINTTYSRC) $(WINQTSRC)
WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
WINLIB = $(WINTTYLIB) -lqt-mt -lSM
QTDIR = $(LOCALBASE)
LINKCMD = g++
LINKCMD = c++

13
games/nethack/patches/patch-sys_unix_Makefile_src
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_unix_Makefile_src,v 1.9 2010/05/19 07:27:25 espie Exp $
$OpenBSD: patch-sys_unix_Makefile_src,v 1.10 2017/03/04 12:42:04 espie Exp $
--- sys/unix/Makefile.src.orig Mon Dec 8 00:39:13 2003
+++ sys/unix/Makefile.src Wed May 19 06:01:29 2010
+++ sys/unix/Makefile.src Sat Mar 4 13:30:02 2017
@@ -1,6 +1,7 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.4 2002/03/02
@ -9,7 +9,7 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.9 2010/05/19 07:27:25 espie Exp $
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
# recursive make calls if $(MAKE) is used
# these makes allow $(MAKE) to be overridden by the environment if someone
@@ -151,8 +152,7 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs
@@ -151,14 +152,13 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs
# flags for debugging:
# CFLAGS = -g -I../include
@ -19,6 +19,13 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.9 2010/05/19 07:27:25 espie Exp $
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in.
CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
-CXX=g++
+CXX=c++
#LINK=g++
# For cross-compiling, eg. with gcc on Linux (see also CC further up):
#CXX=arm-linux-g++
@@ -214,8 +214,6 @@ WINBEOBJ =
#