Unbreak with devel/boost>=1.67.0

This commit is contained in:
rsadowski 2020-08-15 20:30:59 +00:00
parent 849a3c5245
commit 97488451be
2 changed files with 24 additions and 6 deletions

View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.13 2018/12/13 19:53:24 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2020/08/15 20:30:59 rsadowski Exp $
COMMENT = 3D space simulator
DISTNAME = vegastrike-src-${V}
PKGNAME = vegastrike-${V}
REVISION = 5
REVISION = 7
WANTLIB += GL GLU OgreMain SDL X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender atk-1.0
WANTLIB += boost_python boost_thread-mt c cairo expat fontconfig
WANTLIB += boost_python${MODPY_VERSION:C/\.//g} boost_thread-mt c cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glut gobject-2.0 gtk-x11-2.0 iconv intl jpeg m ogg openal pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread ${COMPILER_LIBCXX} util
WANTLIB += vorbis vorbisfile z python2.7
WANTLIB += vorbis vorbisfile z python2.7 harfbuzz
COMPILER = base-clang ports-gcc base-gcc
@ -22,7 +22,7 @@ MODULES = lang/python
RUN_DEPENDS = games/vegastrike/data>=${V}
LIB_DEPENDS = x11/gtk+2 \
audio/openal \
devel/boost \
devel/boost>=1.67.0 \
audio/libvorbis \
x11/ogre \
graphics/freeglut \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.2 2017/06/01 11:29:12 espie Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2020/08/15 20:30:59 rsadowski Exp $
explicitly pass -Wno-#warnings as it's a bitch to pass thru configure
Index: Makefile.in
@ -13,6 +13,24 @@ Index: Makefile.in
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -1532,7 +1532,7 @@ vegastrike_LDADD_1 = $(noinst_LIBRARIES) \
@BOOSTSYSTEM_FALSE@vegastrike_LDADD = $(vegastrike_LDADD_1)
@BOOSTSYSTEM_TRUE@vegastrike_LDADD = $(vegastrike_LDADD_1) \
-@BOOSTSYSTEM_TRUE@ -lboost_python
+@BOOSTSYSTEM_TRUE@ -lboost_python27
vegastrike_DEPENDENCIES = $(noinst_LIBRARIES)
vegaserver_LDADD_1 = $(noinst_LIBRARIES) \
@@ -1540,7 +1540,7 @@ vegaserver_LDADD_1 = $(noinst_LIBRARIES) \
@BOOSTSYSTEM_FALSE@vegaserver_LDADD = $(vegaserver_LDADD_1)
@BOOSTSYSTEM_TRUE@vegaserver_LDADD = $(vegaserver_LDADD_1) \
-@BOOSTSYSTEM_TRUE@ -lboost_python
+@BOOSTSYSTEM_TRUE@ -lboost_python27
vegaserver_DEPENDENCIES = $(noinst_LIBRARIES)
librootclient = \
@@ -1894,7 +1894,7 @@ base_maker_SOURCES = \
src/xml_support.h