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

Fix previous - since those ports don't directly use gcc4 MODULE,

Browse Source 
MODGCC4_CPPWANTLIB cant be defined/used there..

Manually add estdc++ to WANTLIB only on amd64 & i386, with a big comment
explaining why. sigh.

Discussed with sthen@
This commit is contained in:
landry 2016-06-05 10:49:04 +00:00
parent e269bc6257
commit 76ec7350fa
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/gstreamer1/plugins-good/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2016/06/05 10:00:01 landry Exp $
# $OpenBSD: Makefile,v 1.38 2016/06/05 10:49:04 landry Exp $
# XXX ossaudio(3) is only enabled to be used as a mixing device by
# x11/xfce4/xfce4-mixer
@ -27,7 +27,13 @@ WANTLIB-main += gstfft-1.0 gstnet-1.0 gstriff-1.0 gstrtp-1.0 gstrtsp-1.0 xcb-ren
WANTLIB-main += gstallocators-1.0 gstsdp-1.0 jpeg ogg ossaudio png shout soup-2.4
WANTLIB-main += speex sqlite3 stdc++ tag theora vorbis vpx>=5 wavpack xcb-shm
WANTLIB-main += Xrender cairo cairo-gobject expat fontconfig freetype pixman-1
WANTLIB-main += v4l2 v4lconvert ${MODGCC4_CPPWANTLIB}
WANTLIB-main += v4l2 v4lconvert
# comes from multimedia/libvpx using lang/clang MODULE on i386|amd64 only
# which includes gcc4 MODULE with adds gcc-libs in dependency scope
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
WANTLIB += estdc++
.endif
WANTLIB-pulse += ${WANTLIB}
WANTLIB-pulse += execinfo gdbm pulse sndfile X11-xcb Xi Xtst ICE

10
x11/wxSVG/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2016/06/05 10:00:01 landry Exp $
# $OpenBSD: Makefile,v 1.36 2016/06/05 10:49:04 landry Exp $
COMMENT= C++ library to create, manipulate and render SVG files
@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avcodec
WANTLIB += avformat avutil bz2 c cairo crypto ${MODGCC4_CPPWANTLIB} expat ffi
WANTLIB += avformat avutil bz2 c cairo crypto expat ffi
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0
WANTLIB += gtk-x11-2.0 harfbuzz iconv intl iodbc jpeg m mp3lame
@ -30,6 +30,12 @@ WANTLIB += wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html
WANTLIB += wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc x264 x265 xcb
WANTLIB += xcb-render xcb-shm xvidcore z
# comes from multimedia/libvpx using lang/clang MODULE on i386|amd64 only
# which includes gcc4 MODULE with adds gcc-libs in dependency scope
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
WANTLIB += estdc++
.endif
LIB_DEPENDS= graphics/ffmpeg \
graphics/cairo \
x11/wxWidgets