diff options
| author | Asterios Dimitriou | 2020-02-17 16:41:00 +0200 |
|---|---|---|
| committer | Asterios Dimitriou | 2020-02-17 16:41:00 +0200 |
| commit | ff61ba02ed01eab5943644f62a1bfd064c3041a5 (patch) | |
| tree | 85d038314fdf5bce6d8270c1842d5b1e860568eb | |
| parent | 6af02592f0efbfd84a50c1c52a419fcda4a4d16f (diff) | |
| download | aur-ff61ba02ed01eab5943644f62a1bfd064c3041a5.tar.gz | |
Build with make v4.3 is fixed upstream
Set project's url the same with lxd package
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | make43.patch | 13 |
3 files changed, 4 insertions, 24 deletions
@@ -2,7 +2,7 @@ pkgbase = lxd-git pkgdesc = Daemon based on liblxc offering a REST API to manage containers pkgver = 3.21.r10.74cf807fd pkgrel = 1 - url = https://github.com/lxc/lxd + url = https://linuxcontainers.org/lxd arch = x86_64 license = APACHE makedepends = go @@ -30,11 +30,9 @@ 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 @@ -5,11 +5,11 @@ pkgname=lxd-git _pkgname=lxd -pkgver=3.21.r10.74cf807fd +pkgver=3.21.r12.4efa92f71 pkgrel=1 pkgdesc="Daemon based on liblxc offering a REST API to manage containers" arch=('x86_64') -url="https://github.com/lxc/lxd" +url="https://linuxcontainers.org/lxd" license=('APACHE') conflicts=('lxd' 'lxd-lts') provides=('lxd') @@ -28,21 +28,16 @@ options=('!strip' '!emptydirs') source=("git+https://github.com/lxc/lxd.git" "lxd.service" "lxd.socket" - "make43.patch" ) md5sums=('SKIP' '5b7032b4b6adc4c4b80d9a919b9cd8a2' - '1fb28d8dfe82af71d0675c8e9a0a7293' - 'c7c5ef146949d281406b3df2fbf59449') + '1fb28d8dfe82af71d0675c8e9a0a7293') _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 deleted file mode 100644 index 849ad10b02c0..000000000000 --- a/make43.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 |