Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jun 2013 11:45:03 +0000 (UTC)
From:      Alberto Villa <avilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r320192 - head/x11/kactivitymanagerd
Message-ID:  <201306071145.r57Bj3I3080954@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avilla
Date: Fri Jun  7 11:45:03 2013
New Revision: 320192
URL: http://svnweb.freebsd.org/changeset/ports/320192

Log:
  - Add a workaround to fix a crash on exit() on FreeBSD 10.

Modified:
  head/x11/kactivitymanagerd/Makefile

Modified: head/x11/kactivitymanagerd/Makefile
==============================================================================
--- head/x11/kactivitymanagerd/Makefile	Fri Jun  7 11:42:10 2013	(r320191)
+++ head/x11/kactivitymanagerd/Makefile	Fri Jun  7 11:45:03 2013	(r320192)
@@ -26,12 +26,20 @@ DISTINFO_FILE=	${.CURDIR}/../kactivities
 # https://bugs.kde.org/show_bug.cgi?id=305529#c10
 CMAKE_ARGS+=	-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic
 
-# 'USES= moderncompiler' would help, for now force dependence on gcc
+# 'USES= moderncompiler' would help, for now force dependency on gcc
 USE_GCC=	4.6+
 
+.include <bsd.port.pre.mk>
+
+# Workaround to keep kactivitymanagerd from crashing:
+# http://lists.freebsd.org/pipermail/freebsd-current/2012-May/033972.html
+.if ${OSVERSION} > 1000000
+CXXFLAGS+=	-fno-use-cxa-atexit
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "/add_subdirectory (lib)/d" \
 		-e "/add_subdirectory (ontologies)/d" \
 		${WRKSRC}/src/CMakeLists.txt \
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306071145.r57Bj3I3080954>