Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Nov 2016 09:00:19 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425877 - head/net-im/ricochet
Message-ID:  <201611110900.uAB90JPk024590@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Fri Nov 11 09:00:19 2016
New Revision: 425877
URL: https://svnweb.freebsd.org/changeset/ports/425877

Log:
  Unbreak build on FreeBSD 9.x amd64.
  
  (Marked broken since r424405.)
  
  Punch out the -pie used during link, which fixes linker errors.
  (I'd tried setting -fPIE in CXXFLAGS before, which turned out not to
  solve the problem - I won't dig deeper now less than eight weeks before
  9.x goes unsupported.)
  
  PR:		214331 (related)
  Approved by:	portmgr blanket (just fix it)

Modified:
  head/net-im/ricochet/Makefile

Modified: head/net-im/ricochet/Makefile
==============================================================================
--- head/net-im/ricochet/Makefile	Fri Nov 11 09:00:13 2016	(r425876)
+++ head/net-im/ricochet/Makefile	Fri Nov 11 09:00:19 2016	(r425877)
@@ -17,8 +17,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 RUN_DEPENDS=	tor:security/tor
 
-BROKEN_FreeBSD_9_amd64=	does not build
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	ricochet-im
 
@@ -32,8 +30,14 @@ PLIST_FILES=	bin/ricochet \
 		share/icons/hicolor/48x48/apps/ricochet.png \
 		share/icons/hicolor/scalable/apps/ricochet.svg
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \
 		${WRKSRC}/hardened.pri
+.if ${ARCH} == amd64 && ${OSREL:R} == 9
+	@${REINPLACE_CMD} -E 's| -pie| |g' \
+		${WRKSRC}/hardened.pri
+.endif
 
-.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?201611110900.uAB90JPk024590>