pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/go Do not take the basename of GO_DIST_BASE when ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/953d5c4bc3b2
branches:  trunk
changeset: 360084:953d5c4bc3b2
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon Mar 20 22:33:21 2017 +0000

description:
Do not take the basename of GO_DIST_BASE when it is overridden. Needed for
fixing PR pkg/52081.

diffstat:

 lang/go/go-package.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 6f7c2c01e77e -r 953d5c4bc3b2 lang/go/go-package.mk
--- a/lang/go/go-package.mk     Mon Mar 20 22:00:06 2017 +0000
+++ b/lang/go/go-package.mk     Mon Mar 20 22:33:21 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.9 2017/03/15 19:48:40 bsiegert Exp $
+# $NetBSD: go-package.mk,v 1.10 2017/03/20 22:33:21 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 # The compiled Go code is tied to a specific compiler version, and the
@@ -37,7 +37,8 @@
 
 .include "../../lang/go/version.mk"
 
-GO_DIST_BASE?=         ${GO_SRCPATH}
+_GO_DIST_BASE!=                basename ${GO_SRCPATH}
+GO_DIST_BASE?=         ${_GO_DIST_BASE}
 GO_BUILD_PATTERN?=     ${GO_SRCPATH}/...
 
 WRKSRC=                        ${WRKDIR}/src/${GO_SRCPATH}
@@ -58,8 +59,8 @@
 .if !target(post-extract)
 post-extract:
        ${RUN} ${MKDIR} ${WRKSRC}
-       ${RUN} ${RM} -fr ${WRKDIR}/`basename ${GO_DIST_BASE}`/.hg
-       ${RUN} ${MV} ${WRKDIR}/`basename ${GO_DIST_BASE}`/* ${WRKSRC}
+       ${RUN} ${RM} -fr ${WRKDIR}/${GO_DIST_BASE}/.hg
+       ${RUN} ${MV} ${WRKDIR}/${GO_DIST_BASE}/* ${WRKSRC}
 .endif
 
 .if !target(do-build)



Home | Main Index | Thread Index | Old Index