Page MenuHomeFreeBSD
Files F144057541

D15311.id42598.diff
No OneTemporary
Actions

D15311.id42598.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -10,16 +10,16 @@
LICENSE= APACHE20
-ONLY_FOR_ARCHS= amd64
+NOT_FOR_ARCHS= i386
+NOT_FOR_ARCHS_REASON= Uses 64bit types
-BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go \
+BUILD_DEPENDS= go:lang/go \
zip:archivers/zip
USES= compiler gmake
USE_GITHUB= yes
GH_ACCOUNT= gravitational
-GH_TAGNAME= v${DISTVERSION}${DISTVERSIONSUFFIX}
GH_TAG_COMMIT= b3f4ecb
USE_RC_SUBR= teleport
@@ -29,8 +29,9 @@
PLIST_FILES= bin/teleport \
bin/tctl \
bin/tsh \
- etc/teleport.yaml.sample
+ "@sample etc/teleport.yaml.sample"
+# Extra assets are stored in the binary and must not be inadvertently removed
STRIP=
GO_TELEPORT_SRC_DIR= src/github.com/gravitational/teleport
@@ -42,14 +43,14 @@
@${CP} -rp ${WRKDIR}/${PRE_GOPATH_DIR}/* ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/
post-patch:
- @${REINPLACE_CMD} -e "s|%%GH_TAG_COMMIT%%|${GH_TAG_COMMIT}|g" \
+ @${REINPLACE_CMD} -e 's|^GITREF=.*|GITREF=${GH_TAG_COMMIT}|' \
${WRKDIR}/${GO_TELEPORT_SRC_DIR}/version.mk
do-build:
@cd ${WRKDIR}/${GO_TELEPORT_SRC_DIR} && \
${SETENV} ${MAKE_ENV} ${BUILD_ENV} \
CGO_ENABLED=1 GOPATH=${WRKDIR} \
- ${GMAKE} -s full
+ ${GMAKE} full
do-install:
${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/teleport configure > ${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample
Index: files/patch-version.mk
===================================================================
--- files/patch-version.mk
+++ files/patch-version.mk
@@ -1,8 +0,0 @@
---- ../src/github.com/gravitational/teleport/version.mk.orig 2018-05-05 22:53:11 UTC
-+++ ../src/github.com/gravitational/teleport/version.mk
-@@ -1,4 +1,4 @@
--GITREF=`git describe --dirty --long --tags`
-+GITREF="%%GH_TAG_COMMIT%%"
-
- # $(VERSION_GO) will be written to version.go
- VERSION_GO="/* DO NOT EDIT THIS FILE. IT IS GENERATED BY 'make setver'*/\n\n\

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 5, 1:26 AM (2 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28439142
Default Alt Text
D15311.id42598.diff (1 KB)

Event Timeline