Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jan 2015 19:04:36 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377039 - head/sysutils/clsync
Message-ID:  <201501141904.t0EJ4a0J053560@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Jan 14 19:04:35 2015
New Revision: 377039
URL: https://svnweb.freebsd.org/changeset/ports/377039
QAT: https://qat.redports.org/buildarchive/r377039/

Log:
  - Remove compiler flag unknown to clang to fix build on 10+
  - Use INSTALL_PROGRAM to install binary, which fixes stripping
  - Remove slashes after ${STAGEDIR}
  
  PR:		195906
  Submitted by:	amdmi3
  Approved by:	maintainer timeout

Modified:
  head/sysutils/clsync/Makefile

Modified: head/sysutils/clsync/Makefile
==============================================================================
--- head/sysutils/clsync/Makefile	Wed Jan 14 19:04:35 2015	(r377038)
+++ head/sysutils/clsync/Makefile	Wed Jan 14 19:04:35 2015	(r377039)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libinotify.so:${PORTSDIR}/d
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf gmake libtool pkgconfig
+USES=		autoreconf compiler:features gmake libtool pkgconfig
 USE_GNOME=	glib20
 
 USE_RC_SUBR=	clsync
@@ -38,7 +38,7 @@ LIBCLSYNC_DESC=	Build libclsync.so for c
 
 OPTIONS_DEFAULT=PARANOID
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MVERYPARANOID}
 CONFIGURE_ARGS+=	--enable-paranoid=2
@@ -62,10 +62,15 @@ CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=	--enable-libclsync
 .endif
 
+.if ${COMPILER_TYPE} == clang
+post-patch:
+	@${REINPLACE_CMD} -e 's|-fstack-check||' ${WRKSRC}/configure.ac
+.endif
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/clsync ${STAGEDIR}/${PREFIX}/sbin/clsync
-	${INSTALL_DATA} ${WRKSRC}/man/man1/clsync.1 ${STAGEDIR}/${PREFIX}/man/man1/clsync.1
-	${MKDIR} ${STAGEDIR}/${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/freebsd/usr/local/etc/clsync/${PORTNAME}.conf ${STAGEDIR}/${ETCDIR}/${PORTNAME}.conf.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/clsync ${STAGEDIR}${PREFIX}/sbin/clsync
+	${INSTALL_DATA} ${WRKSRC}/man/man1/clsync.1 ${STAGEDIR}${PREFIX}/man/man1/clsync.1
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/freebsd/usr/local/etc/clsync/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
-.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?201501141904.t0EJ4a0J053560>