Skip to content
Snippets Groups Projects
Commit 1a8ad91e authored by Patrycja Rosa's avatar Patrycja Rosa :cat: Committed by Natanael Copa
Browse files

main/abuild: backport patch for disabling go buildvcs

parent bf3cf511
2 merge requests!39304[3.16] main/expat: security upgrade to 2.4.9,!38392main/abuild: backport patch for disabling go buildvcs
Pipeline #134782 passed
......@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.9.0
_ver=${pkgver%_git*}
pkgrel=5
pkgrel=6
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
......@@ -32,6 +32,7 @@ source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$p
mr131-newapkbuild-change-cmake-build-type.patch
mr134-modcacherw.patch
mr127-doas.patch
mr142-disable-go-buildvcs.patch
"
builddir="$srcdir"/abuild-$pkgver
......@@ -95,4 +96,5 @@ f8d5c131cefb1c10d34962994ee3158fd8155acf68616fe471a7d07ce15e04d184bdfa3c181ec19b
56b71c3feff5a17d9550e1947fe316b7c7aa397f9e365532410e492ea992b8bfcfbb97041ddc2128c7bb9772e9e03584a9f5d5f5bcced00a1082e7374f02801a mr131-newapkbuild-change-cmake-build-type.patch
9a8697819a3c94a968be33eb014a8f59ea15cefd46046b7fb6ef58fcfde37d5a4243f0aaafe51ab6f43766c94775332ea88d4d07cccc3bd0d9443c26651aef21 mr134-modcacherw.patch
41e68d43db29823305b0496cd35908951a169a7cf4715fb29a6b23c148fc9275cee019e88a7cded45e9ac2d48bdab574f61207d9cdff181efce29a97228e3e29 mr127-doas.patch
701dbcf5bff3d82b8f17a049a33ba969f8f1b2151ad82c3854181b0949633474e720cd4f0be490f8163ef3351dcceed20c9bc1e89591d7ea11257495b1e6332e mr142-disable-go-buildvcs.patch
"
From f7f53bac2801cbddffcc36b0af0a5a8d7509b777 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 1 Apr 2022 13:57:06 -0700
Subject: [PATCH] abuild.conf: disable Go's buildvcs
This was added in Go 1.18 and enabled by default, and causes builds to
fail if $builddir is not a repo.
---
abuild.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abuild.conf b/abuild.conf
index 4ff34f1..e0270ce 100644
--- a/abuild.conf
+++ b/abuild.conf
@@ -2,7 +2,7 @@ export CFLAGS="-Os -fomit-frame-pointer"
export CXXFLAGS="$CFLAGS"
export CPPFLAGS="$CFLAGS"
export LDFLAGS="-Wl,--as-needed,-O1,--sort-common"
-export GOFLAGS="-buildmode=pie"
+export GOFLAGS="-buildmode=pie -buildvcs=false"
# Do note that these should work with at least GDC and LDC
export DFLAGS="-Os"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment