[PR PATCH] etcd: build with vendored libraries

[PR PATCH] etcd: build with vendored libraries

[sgn]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-etcd
https://github.com/void-linux/void-packages/pull/26448

etcd: build with vendored libraries
Also xlintify.

A patch file from https://github.com/void-linux/void-packages/pull/26448.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-etcd-26448.patch --]
[-- Type: text/x-diff, Size: 1426 bytes --]

From b721c656e0f3b69d3e21d51990a3ec3380cca03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 12 Sep 2020 07:57:27 +0700
Subject: [PATCH] etcd: build with vendored libraries

Also xlintify.
---
 srcpkgs/etcd/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..b255d53874f 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,15 +1,13 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.4
-revision=1
+revision=2
 build_style=go
+go_import_path="github.com/coreos/etcd"
+go_package="${go_import_path} ${go_import_path}/etcdctl"
 short_desc="Distributed reliable key-value store"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-hostmakedepends="git glide"
-go_import_path="github.com/coreos/etcd"
-go_package="${go_import_path} ${go_import_path}/etcdctl"
-go_mod_mode="default"
 homepage="https://coreos.com/etcd/docs/latest/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=46bcd0d034fe9cc6ae86a9f2a72bdc78761ca99bfd5ae4b96b24e4ad93fc627e
@@ -17,7 +15,10 @@ conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
 
+post_extract() {
+	ln -s $wrksrc vendor/$go_import_path
+}
+
 post_install() {
-	vlicense LICENSE
 	vsv etcd
 }

Re: [PR PATCH] [Merged]: etcd: build with vendored libraries

[sgn]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

There's a merged pull request on the void-packages repository

etcd: build with vendored libraries
https://github.com/void-linux/void-packages/pull/26448

Description:
Also xlintify.