summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsterios Dimitriou2020-02-17 13:35:57 +0200
committerAsterios Dimitriou2020-02-17 13:37:34 +0200
commit6af02592f0efbfd84a50c1c52a419fcda4a4d16f (patch)
treec923c8a17d934c771486ffdf51654cd305d58bc0
parent94deb30dd61d641f2a844ab4c3f55d293b4e9cc0 (diff)
downloadaur-6af02592f0efbfd84a50c1c52a419fcda4a4d16f.tar.gz
Allow compile with GNU make 4.3
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--make43.patch13
3 files changed, 23 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f60cd557838..4b3b3f45bd9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lxd-git
pkgdesc = Daemon based on liblxc offering a REST API to manage containers
- pkgver = 3.19.r174.4e607231d
+ pkgver = 3.21.r10.74cf807fd
pkgrel = 1
url = https://github.com/lxc/lxd
arch = x86_64
@@ -30,9 +30,11 @@ pkgbase = lxd-git
source = git+https://github.com/lxc/lxd.git
source = lxd.service
source = lxd.socket
+ source = make43.patch
md5sums = SKIP
md5sums = 5b7032b4b6adc4c4b80d9a919b9cd8a2
md5sums = 1fb28d8dfe82af71d0675c8e9a0a7293
+ md5sums = c7c5ef146949d281406b3df2fbf59449
pkgname = lxd-git
install = lxd.install
diff --git a/PKGBUILD b/PKGBUILD
index 10ea5c80dfe0..3e03cb17c1d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=lxd-git
_pkgname=lxd
-pkgver=3.19.r157.5e6963a91
+pkgver=3.21.r10.74cf807fd
pkgrel=1
pkgdesc="Daemon based on liblxc offering a REST API to manage containers"
arch=('x86_64')
@@ -28,16 +28,21 @@ options=('!strip' '!emptydirs')
source=("git+https://github.com/lxc/lxd.git"
"lxd.service"
"lxd.socket"
+ "make43.patch"
)
md5sums=('SKIP'
'5b7032b4b6adc4c4b80d9a919b9cd8a2'
- '1fb28d8dfe82af71d0675c8e9a0a7293')
+ '1fb28d8dfe82af71d0675c8e9a0a7293'
+ 'c7c5ef146949d281406b3df2fbf59449')
_lxd=github.com/lxc/lxd
prepare() {
mkdir -p "${srcdir}/go/src/github.com/lxc"
ln -rTsf "${_pkgname}" "${srcdir}/go/src/${_lxd}"
+
+ cd "${srcdir}/go/src/${_lxd}"
+ patch -p1 -i "${srcdir}/make43.patch"
}
pkgver() {
diff --git a/make43.patch b/make43.patch
new file mode 100644
index 000000000000..849ad10b02c0
--- /dev/null
+++ b/make43.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 3ff398dbb..b2e27a6d0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@ LINGUAS=$(basename $(POFILES))
+ POTFILE=po/$(DOMAIN).pot
+ VERSION=$(shell grep "var Version" shared/version/flex.go | cut -d'"' -f2)
+ ARCHIVE=lxd-$(VERSION).tar
+-TAG_SQLITE3=$(shell printf "\#include <sqlite3.h>\nvoid main(){int n = SQLITE_IOERR_NOT_LEADER;}" | $(CC) ${CGO_CFLAGS} -o /dev/null -xc - >/dev/null 2>&1 && echo "libsqlite3")
++TAG_SQLITE3=$(shell printf "#include <sqlite3.h>\nvoid main(){int n = SQLITE_IOERR_NOT_LEADER;}" | $(CC) ${CGO_CFLAGS} -o /dev/null -xc - >/dev/null 2>&1 && echo "libsqlite3")
+ GOPATH ?= $(HOME)/go
+
+ .PHONY: default