Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jun 2016 22:21:21 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417039 - in head/devel/fossil: . files
Message-ID:  <201606172221.u5HMLLxi014590@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Jun 17 22:21:21 2016
New Revision: 417039
URL: https://svnweb.freebsd.org/changeset/ports/417039

Log:
  Fix build with fuse option on
  
  PR:		210359
  Submitted by:	matthew@reztek.cz

Added:
  head/devel/fossil/files/patch-autosetup_cc.tcl   (contents, props changed)
Modified:
  head/devel/fossil/Makefile

Modified: head/devel/fossil/Makefile
==============================================================================
--- head/devel/fossil/Makefile	Fri Jun 17 21:48:09 2016	(r417038)
+++ head/devel/fossil/Makefile	Fri Jun 17 22:21:21 2016	(r417039)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fossil
 PORTVERSION=	1.35
+PORTREVISION=	1
 DISTVERSIONPREFIX=	src-
 PORTEPOCH=	2
 CATEGORIES=	devel www
@@ -31,7 +32,8 @@ JSON_CONFIGURE_ON=	--json
 STATIC_CONFIGURE_ON=	--static
 FUSE_CONFIGURE_OFF=	--disable-fusefs
 FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
-FUSE_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+FUSE_CFLAGS=		-I${LOCALBASE}/include
+FUSE_LDFLAGS=		-L${LOCALBASE}/lib
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fossil

Added: head/devel/fossil/files/patch-autosetup_cc.tcl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fossil/files/patch-autosetup_cc.tcl	Fri Jun 17 22:21:21 2016	(r417039)
@@ -0,0 +1,11 @@
+--- autosetup/cc.tcl.orig	2016-06-14 11:10:39 UTC
++++ autosetup/cc.tcl
+@@ -501,6 +501,8 @@ proc cctest {args} {
+ 	if {!$opts(-link)} {
+ 		set tmp conftest__.o
+ 		lappend cmdline -c
++	} else {
++		lappend cmdline {*}[get-define LDFLAGS]
+ 	}
+ 	lappend cmdline {*}$opts(-cflags) {*}[get-define cc-default-debug ""]
+ 



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