Some bugfixes for go-module.mk.
- Also replace exclamation marks in paths - Fix show-go-modules target
This commit is contained in:
parent
190ea1c869
commit
e99e3895e0
|
@ -65,20 +65,20 @@ do-install:
|
||||||
|
|
||||||
.PHONY: show-go-modules
|
.PHONY: show-go-modules
|
||||||
show-go-modules: ${WRKDIR}/.extract_done
|
show-go-modules: ${WRKDIR}/.extract_done
|
||||||
${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get -d
|
${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} GOPROXY= ${GO} get -d
|
||||||
${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.mod" | ${SED} -e 's/\.\//GO_MODULE_FILES+= /'
|
${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.mod" | ${SED} -e 's/\.\//GO_MODULE_FILES+= /'
|
||||||
${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.zip" | ${SED} -e 's/\.\//GO_MODULE_FILES+= /'
|
${RUN} cd ${WRKDIR}/.gopath/pkg/mod/cache/download && ${FIND} . -type f -name "*.zip" | ${SED} -e 's/\.\//GO_MODULE_FILES+= /'
|
||||||
|
|
||||||
DISTFILES?= ${DEFAULT_DISTFILES}
|
DISTFILES?= ${DEFAULT_DISTFILES}
|
||||||
.for i in ${GO_MODULE_FILES}
|
.for i in ${GO_MODULE_FILES}
|
||||||
DISTFILES+= ${i:S/\//_/g}
|
DISTFILES+= ${i:C/[\/!]/_/g}
|
||||||
SITES.${i:S/\//_/g}= -https://proxy.golang.org/${i}
|
SITES.${i:C/[\/!]/_/g}= -https://proxy.golang.org/${i}
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
post-extract:
|
post-extract:
|
||||||
.for i in ${GO_MODULE_FILES}
|
.for i in ${GO_MODULE_FILES}
|
||||||
${MKDIR} ${WRKDIR}/.goproxy/${i:H}
|
${MKDIR} ${WRKDIR}/.goproxy/${i:H}
|
||||||
cp ${DISTDIR}/${DIST_SUBDIR}/${i:S/\//_/g} ${WRKDIR}/.goproxy/${i}
|
cp ${DISTDIR}/${DIST_SUBDIR}/${i:C/[\/!]/_/g} ${WRKDIR}/.goproxy/${i}
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
_VARGROUPS+= go
|
_VARGROUPS+= go
|
||||||
|
|
Loading…
Reference in New Issue