Date: Wed, 29 Apr 2015 21:44:00 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385015 - in branches/2015Q2: databases/evolution-data-server mail/evolution Message-ID: <201504292144.t3TLi083055474@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Wed Apr 29 21:44:00 2015 New Revision: 385015 URL: https://svnweb.freebsd.org/changeset/ports/385015 Log: MFH: r384997 Convert databases/evolution-data-server to USES=compiler:c++11-lib so that on FreeBSD 8 and 9 it will be linked to the newer libstdc++ bundled with lang/gcc. This unbreaks the startup of mail/evolution on FreeBSD 8 and 9 because evolution is also linked to webkit-gtk3, which requires the newer libstdc++ and causes rtld to fail if the base version of libstdc++ has already been loaded. PR: 199746 Approved by: portmgr (delphij) Modified: branches/2015Q2/databases/evolution-data-server/Makefile branches/2015Q2/mail/evolution/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/evolution-data-server/Makefile ============================================================================== --- branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -26,6 +27,11 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORT libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring USES= bison gettext gmake gperf libtool pathfix pkgconfig tar:xz +# Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9. Normally +# this change would be done there, but it is not a C++ application, so it +# does not link directly to libstdc++ and adding the libstdc++ rpath to +# the executable does not work at runtime. +USES+= compiler:c++11-lib USE_GNOME= gnomeprefix gtk30 intlhack introspection:build \ libxml2 USE_OPENLDAP= yes Modified: branches/2015Q2/mail/evolution/Makefile ============================================================================== --- branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution PORTVERSION= 3.12.11 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -106,11 +107,6 @@ CONFIGURE_ARGS+=--disable-contact-maps .include <bsd.port.options.mk> -# webkit-gtk3 needs this -.if ${OSVERSION} < 1000000 -USES+= compiler:c++11-lib -.endif - post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504292144.t3TLi083055474>