more WANT_CXX

This commit is contained in:
espie 2017-05-28 19:29:27 +00:00
parent ebc1547efb
commit 8348043cb2
2 changed files with 6 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2017/04/19 11:16:03 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2017/05/28 19:29:27 espie Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
.if (${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm64")
@ -22,13 +22,11 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += Half Iex IexMath IlmImf IlmThread Imath c gsl gslcblas
WANTLIB += jpeg lcms2 m png pthread tiff vigraimpex z
WANTLIB += jpeg lcms2 m png pthread tiff vigraimpex z ${LIBECXX}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=enblend/}
MODULES = gcc4
MODGCC4_ARCHS = *
MODGCC4_LANGS +=c++
WANT_CXX = base gcc
BUILD_DEPENDS = devel/help2man\
math/gnuplot \
print/texlive/base \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.50 2016/11/24 19:21:27 sthen Exp $
# $OpenBSD: Makefile,v 1.51 2017/05/28 19:29:27 espie Exp $
BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa
@ -38,6 +38,7 @@ WANTLIB += png pthread sqlite3 tiff vigraimpex wx_base>=3
WANTLIB += wx_base_net>=3 wx_base_xml>=3 wx_gtk2_adv>=3
WANTLIB += wx_gtk2_aui>=3 wx_gtk2_core>=3 wx_gtk2_gl>=3
WANTLIB += wx_gtk2_qa wx_gtk2_html>=3 wx_gtk2_xrc>=3 z ${MODPY_WANTLIB}
WANTLIB += ${LIBECXX}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@ -60,9 +61,7 @@ LIB_DEPENDS = devel/boost>=1.58 \
graphics/vigra \
x11/wxWidgets>=2.8.12p7
MODULES = devel/cmake lang/python gcc4
MODGCC4_ARCHS = *
MODGCC4_LANGS += c++
MODULES = devel/cmake lang/python
CONFIGURE_ENV = MANDIR=man
CONFIGURE_ARGS += -DBUILD_HSI=ON
NO_TEST = Yes