Re: go module fix

(for those that didn't see the start of this, landry was hitting E2BIG
because the shell command line was too long with all the damn modules
on something he was porting..)

On 2021/10/30 19:41, Stuart Henderson wrote:
> > > -. endfor
> > > +MODGO_SETUP_WORKSPACE = ln -sf ${WRKSRC} ${WRKDIR}/${MODGO_MODNAME}; \
> >
> > cd ${DISTDIR}; here allow getting rid of the repeated dirs in the install line
> >
> > > + for m in ${_MODGO_SETUP}; do \
> > > + ${INSTALL} -D ${DISTDIR}/$$m ${WRKDIR}/$$m; \
> >
> > ${INSTALL} -D {,${WRKDIR}/$$m; \
>
> typo, I meant:
>
> ${INSTALL} -D {,${WRKDIR}}/$$m; \

and I messed up my typo fix too :/ anyway with the shell loop I
suppose this doesn't help much anyway.

we can factor out some repeated MODGO_DIST_SUBDIR and .mod / .zip
though:

Index: go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.46
diff -u -p -r1.46 go.port.mk
--- go.port.mk 30 Oct 2021 18:06:09 -0000 1.46
+++ go.port.mk 30 Oct 2021 19:12:32 -0000
@@ -77,10 +77,11 @@ EXTRACT_ONLY = ${DISTNAME_ESC}${EXTRACT
MASTER_SITES ?= ${MASTER_SITE_ATHENS}${MODGO_MODNAME_ESC}/@v/
. for _modpath _modver in ${MODGO_MODULES}
DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.zip{${_modpath}/@v/${_modver}.zip}:${MODGO_MASTER_SITESN}
-DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.mod{${_modpath}/@v/${_modver}.mod}:${MODGO_MASTER_SITESN}
+_MODGO_SETUP_ZIP += ${_modpath}/@v/${_modver}
. endfor
-. for _modpath _modver in ${MODGO_MODFILES}
+. for _modpath _modver in ${MODGO_MODFILES} ${MODGO_MODULES}
DISTFILES += ${MODGO_DIST_SUBDIR}/${_modpath}/@v/${_modver}.mod{${_modpath}/@v/${_modver}.mod}:${MODGO_MASTER_SITESN}
+_MODGO_SETUP_MOD += ${_modpath}/@v/${_modver}
. endfor
MAKE_ENV += GOPROXY=file://${WRKDIR}/go_modules
MAKE_ENV += GO111MODULE=on GOPATH="${MODGO_GOPATH}"
@@ -116,10 +117,13 @@ WRKSRC ?= ${MODGO_WORKSPACE}/src/${ALL_
MODGO_SETUP_WORKSPACE = mkdir -p ${WRKSRC:H}; mv ${MODGO_SUBDIR} ${WRKSRC};
.else
WRKSRC ?= ${WRKDIR}/${MODGO_MODNAME}@${MODGO_VERSION}
-MODGO_SETUP_WORKSPACE = ln -sf ${WRKSRC} ${WRKDIR}/${MODGO_MODNAME};
-. for _MODGO_m in ${DISTFILES:Mgo_modules/*:C/{.*//}
-MODGO_SETUP_WORKSPACE += ${INSTALL} -D ${DISTDIR}/${_MODGO_m} ${WRKDIR}/${_MODGO_m};
-. endfor
+MODGO_SETUP_WORKSPACE = ln -sf ${WRKSRC} ${WRKDIR}/${MODGO_MODNAME}; \
+ for m in ${_MODGO_SETUP_ZIP}; do \
+ ${INSTALL} -D ${DISTDIR}/${MODGO_DIST_SUBDIR}/$$m.zip ${WRKDIR}/${MODGO_DIST_SUBDIR}/$$m.zip; \
+ done; \
+ for m in ${_MODGO_SETUP_MOD}; do \
+ ${INSTALL} -D ${DISTDIR}/${MODGO_DIST_SUBDIR}/$$m.mod ${WRKDIR}/${MODGO_DIST_SUBDIR}/$$m.mod; \
+ done
.endif

INSTALL_STRIP =