aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Honnef <dominik@honnef.co>2015-02-21 12:52:10 +0000
committerDominik Honnef <dominik@honnef.co>2015-02-21 13:49:02 +0000
commitbd750884229ebf4518683223873ba25ea3145a97 (patch)
tree45067f55fb175fdb7408eb569291723bc8e4ace0
parent77e8751a931405230d6746a4f9d40ec575271a3a (diff)
downloadvoid-packages-bd750884229ebf4518683223873ba25ea3145a97.tar
void-packages-bd750884229ebf4518683223873ba25ea3145a97.tar.gz
void-packages-bd750884229ebf4518683223873ba25ea3145a97.tar.bz2
void-packages-bd750884229ebf4518683223873ba25ea3145a97.tar.lz
void-packages-bd750884229ebf4518683223873ba25ea3145a97.tar.xz
void-packages-bd750884229ebf4518683223873ba25ea3145a97.tar.zst
void-packages-bd750884229ebf4518683223873ba25ea3145a97.zip
rename import_path to go_import_path
-rw-r--r--Manual.md10
-rw-r--r--common/build-style/go.sh6
-rw-r--r--srcpkgs/gendesk/template2
-rw-r--r--srcpkgs/hub/template2
4 files changed, 10 insertions, 10 deletions
diff --git a/Manual.md b/Manual.md
index 130bc5185f3..a80e486a74e 100644
--- a/Manual.md
+++ b/Manual.md
@@ -514,7 +514,7 @@ target can be overriden via `make_build_target` and the install target
via `make_install_target`.
- `go` For programs written in Go that follow the standard package
- structure. The variable `import_path` must be set to the package's
+ structure. The variable `go_import_path` must be set to the package's
import path, e.g. `github.com/github/hub` for the `hub` program. If
the variable `go_get` is set to `yes`, the package will be
downloaded with `go get`. Otherwise (the default) it's expected that
@@ -939,10 +939,10 @@ setting up cross compilation.
The following variables influence how Go packages are built:
-- `import_path`: The import path of the package, as it would be used
- with `go get`. For example, GitHub's `hub` program has the import
- path `github.com/github/hub`. This variable is required.
-- `go_get`: If set to yes, the package specified via `import_path`
+- `go_import_path`: The import path of the package, as it would be
+ used with `go get`. For example, GitHub's `hub` program has the
+ import path `github.com/github/hub`. This variable is required.
+- `go_get`: If set to yes, the package specified via `go_import_path`
will be downloaded with `go get`. Otherwise, a distfile has to be
provided. This option should only be used with `-git` (or similar)
packages; using a versioned distfile is prefered.
diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index ab45d59dc1b..102be2a1fd5 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -13,13 +13,13 @@ do_build() {
export GOPATH="/tmp/gopath"
if [[ "${go_get}" != "yes" ]]; then
- local path="${GOPATH}/src/${import_path}"
+ local path="${GOPATH}/src/${go_import_path}"
mkdir -p "$(dirname ${path})"
ln -fs $PWD "${path}"
fi
- go get -d -v "${import_path}"
- go build -x "${import_path}"
+ go get -d -v "${go_import_path}"
+ go build -x "${go_import_path}"
}
do_install() {
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 3a48a2b9c61..8ed9d6acf65 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -4,7 +4,7 @@ version=0.6.2
revision=2
build_style=go
hostmakedepends="git mercurial"
-import_path="github.com/xyproto/gendesk"
+go_import_path="github.com/xyproto/gendesk"
short_desc="Utility to generate .desktop files and download icons"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 31d5fd21e42..c1cdfba9021 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -3,7 +3,7 @@ pkgname=hub
version=2.2.0
revision=2
build_style=go
-import_path="github.com/github/hub"
+go_import_path="github.com/github/hub"
hostmakedepends="git"
homepage="http://hub.github.com/"
distfiles="https://github.com/github/hub/archive/v${version}.tar.gz"