Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 21:57:15 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494656 - in head/devel/gitlab-runner: . files
Message-ID:  <201903042157.x24LvFQl094976@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Mon Mar  4 21:57:14 2019
New Revision: 494656
URL: https://svnweb.freebsd.org/changeset/ports/494656

Log:
  devel/gitlab-runner: fix build after go 1.12 update
  
  PR:		236131
  Submitted by:	mfechner

Added:
  head/devel/gitlab-runner/files/patch-mknod.go   (contents, props changed)
Modified:
  head/devel/gitlab-runner/Makefile   (contents, props changed)

Modified: head/devel/gitlab-runner/Makefile
==============================================================================
--- head/devel/gitlab-runner/Makefile	Mon Mar  4 21:52:41 2019	(r494655)
+++ head/devel/gitlab-runner/Makefile	Mon Mar  4 21:57:14 2019	(r494656)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitlab-runner
 PORTVERSION=	11.7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	\
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
@@ -25,6 +26,7 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		git:devel/git
 
 USE_GITLAB=	yes
+
 GL_ACCOUNT=	gitlab-org
 GL_COMMIT=	8bb608ff3a677132022502b07dae8a3ea679f3d1
 GITBRANCH=	11-7-stable
@@ -47,6 +49,7 @@ post-extract:
 	@${MKDIR} ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
+	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 
 do-build:
 	@cd ${WRKSRC} && go-bindata \
@@ -59,7 +62,6 @@ do-build:
 		out/docker/prebuilt-x86_64.tar.xz \
 		out/docker/prebuilt-arm.tar.xz
 	@cd ${WRKSRC} && go fmt executors/docker/bindata.go
-	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 	@${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org
 	@${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner
 	@cd ${WRKSRC} && \

Added: head/devel/gitlab-runner/files/patch-mknod.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gitlab-runner/files/patch-mknod.go	Mon Mar  4 21:57:14 2019	(r494656)
@@ -0,0 +1,11 @@
+--- src/github.com/docker/docker/pkg/system/mknod.go.orig	2019-03-01 15:22:53 UTC
++++ src/github.com/docker/docker/pkg/system/mknod.go
+@@ -9,7 +9,7 @@ import (
+ // Mknod creates a filesystem node (file, device special file or named pipe) named path
+ // with attributes specified by mode and dev.
+ func Mknod(path string, mode uint32, dev int) error {
+-	return syscall.Mknod(path, mode, dev)
++	return syscall.Mknod(path, mode, uint64(dev))
+ }
+ 
+ // Mkdev is used to build the value of linux devices (in /dev/) which specifies major



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