Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2016 12:36:14 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424693 - head/devel/git-cinnabar
Message-ID:  <201610261236.u9QCaEqk020818@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Oct 26 12:36:14 2016
New Revision: 424693
URL: https://svnweb.freebsd.org/changeset/ports/424693

Log:
  devel/git-cinnabar: unbreak non-poudriere build
  
  != (like :=) expands variables during assignment, but PORTSDIR is only
  guaranteed to be defined after .include <bsd.port*.mk>.
  
    $ make clean all -C devel/git-cinnabar
    make[1]: chdir /devel/git: No such file or directory
    make: "/usr/ports/devel/git-cinnabar/Makefile" line 25: warning: "make -V WRKSRC -C /devel/git" returned non-zero status
    make[1]: chdir /devel/git: No such file or directory
    make: "/usr/ports/devel/git-cinnabar/Makefile" line 26: warning: "make -V MAKE_ENV -C /devel/git" returned non-zero status
    make[1]: chdir /devel/git: No such file or directory
    make: "/usr/ports/devel/git-cinnabar/Makefile" line 27: warning: "make -V MAKE_ARGS -C /devel/git" returned non-zero status
    [...]
    ===>   Returning to build of git-cinnabar-0.4.0.b3.6
    ===>   git-cinnabar-0.4.0.b3.6 depends on executable: gmake - found
    ===>  Configuring for git-cinnabar-0.4.0.b3.6
    find: ./.pw: Permission denied
    find: ./.pw: Permission denied
    *** Error code 1
  
  Reported by:	vd

Modified:
  head/devel/git-cinnabar/Makefile   (contents, props changed)

Modified: head/devel/git-cinnabar/Makefile
==============================================================================
--- head/devel/git-cinnabar/Makefile	Wed Oct 26 12:04:47 2016	(r424692)
+++ head/devel/git-cinnabar/Makefile	Wed Oct 26 12:36:14 2016	(r424693)
@@ -22,9 +22,9 @@ SHEBANG_LANG=	python2.7
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 .ifnmake describe
-WRKSRC_git!=	${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git
-MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${PORTSDIR}/devel/git
-MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${PORTSDIR}/devel/git
+WRKSRC_git!=	${MAKE} -V WRKSRC -C ${.CURDIR}/../git
+MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git
+MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git
 .endif
 MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
 DATADIR=	${PREFIX}/libexec/git-core



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