svn commit: r424975 - head/net-im/qTox

[Jason E. Hale]

Author: jhale
Date: Mon Oct 31 07:00:10 2016
New Revision: 424975
URL: https://svnweb.freebsd.org/changeset/ports/424975

Log:
  Fix build for 9.x i386
  
  Quarterly branch has a different version, but suffers from the same error, so
  the fix should be backported.
  
  videoframe.o: In function `VideoFrame::VideoFrame(unsigned long long, AVFrame*, QRect, int, bool)':
  videoframe.cpp:(.text+0x19db): undefined reference to `__atomic_fetch_add_8'
  camerasource.o: In function `CameraSource::CameraSource()':
  camerasource.cpp:(.text+0x327): undefined reference to `__atomic_fetch_add_8'
  corevideosource.o: In function `CoreVideoSource::CoreVideoSource()':
  corevideosource.cpp:(.text+0x121): undefined reference to `__atomic_fetch_add_8'
  collect2: error: ld returned 1 exit status
  gmake: *** [Makefile:793: qtox] Error 1
  
  PR:		213841
  Submitted by:	<matthew at reztek.cz>
  Approved by:	<yuri at rawbw.com> (maintainer)
  MFH:		2016Q4

Modified:
  head/net-im/qTox/Makefile

Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile	Mon Oct 31 06:58:31 2016	(r424974)
+++ head/net-im/qTox/Makefile	Mon Oct 31 07:00:10 2016	(r424975)
@@ -24,8 +24,6 @@ LIB_DEPENDS=	libtoxcore.so:net-im/tox \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-BROKEN_FreeBSD_9_i386=	does not build
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	tux3
 
@@ -47,6 +45,13 @@ PLIST_FILES=	bin/qtox \
 PLIST_FILES+=	share/icons/hicolor/${SZ}/apps/qtox.png
 .endfor
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == i386 && !${CFLAGS:M-march=*}
+# Needed for __atomic_fetch_add_8
+CFLAGS+=	-march=i586
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!"
@@ -75,4 +80,4 @@ post-install:
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>