summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-06-17 22:21:21 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-06-17 22:21:21 +0000
commit5bec2b85eb0bd1141301bf77c47b09cb9728458e (patch)
tree85acd33bb3983795d7811f5d26231ce26535a7c5
parentAdd docbook stuff to BUILD_DEPEND, otherwise build may die, when (diff)
Fix build with fuse option on
PR: 210359 Submitted by: matthew@reztek.cz
-rw-r--r--devel/fossil/Makefile4
-rw-r--r--devel/fossil/files/patch-autosetup_cc.tcl11
2 files changed, 14 insertions, 1 deletions
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 1cdf2f868c60..3146bed01342 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -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
diff --git a/devel/fossil/files/patch-autosetup_cc.tcl b/devel/fossil/files/patch-autosetup_cc.tcl
new file mode 100644
index 000000000000..0a878c5e82e8
--- /dev/null
+++ b/devel/fossil/files/patch-autosetup_cc.tcl
@@ -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 ""]
+