summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfossdd2021-06-27 11:36:37 +0000
committerfossdd2021-06-27 11:36:37 +0000
commitc8566546e09650624fc109cf090d97af492eb566 (patch)
tree196c8ba54f04946fd076f2e54322117d48f4b010
parent596803e397b97569ff614465ffc84fda3ce36c7d (diff)
downloadaur-vlang-coreutils-git.tar.gz
add destdir patch
-rw-r--r--PKGBUILD5
-rw-r--r--destdir.patch28
2 files changed, 31 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d0a40d101bdb..69f3819d2e97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,9 @@ pkgver() {
)
}
-build() {
- cd "$_pkgname"
+prepare() {
+ cd "$srcdir"
+ patch --verbose --ignore-whitespace --fuzz 3 --forward --strip=1 --input="../destdir.patch"
}
package() {
diff --git a/destdir.patch b/destdir.patch
new file mode 100644
index 000000000000..292dbf8e03bd
--- /dev/null
+++ b/destdir.patch
@@ -0,0 +1,28 @@
+diff --git a/coreutils/build.vsh b/coreutils/build.vsh
+--- a/coreutils/build.vsh
++++ b/coreutils/build.vsh
+@@ -4,12 +4,14 @@ const (
+ ignore_dirs = []string{}
+ )
+
++destdir := if os.environ()["DESTDIR"] != "" { os.environ()["DESTDIR"] } else { "bin" }
++
+ vargs := if os.args.len > 1 { os.args[1..] } else { []string{} }
+
+ dirs := ls('.') ?.filter(is_dir(it))
+
+-if !exists('bin') {
+- mkdir('bin') ?
++if !exists(destdir) {
++ mkdir_all(destdir) ?
+ }
+
+ for dir in dirs {
+@@ -27,6 +29,6 @@ for dir in dirs {
+ final_args += arg + ' '
+ }
+ println('compiling ${dir}...')
+- cmd := 'v $final_args-o bin/$dir $dir'
++ cmd := 'v $final_args-o $destdir/$dir $dir'
+ execute_or_panic(cmd)
+ }