diff options
| author | Jonathon Fernyhough | 2021-10-06 02:33:16 +0100 |
|---|---|---|
| committer | Jonathon Fernyhough | 2021-10-06 02:35:37 +0100 |
| commit | 695b7abdec6077bf938ef6447b45fc8b99d6daa1 (patch) | |
| tree | 771be3d7cbc80245726d3118f04de46633db3983 | |
| parent | b987b6dfb42d8d630221a15feadc79fbd7ef2ab3 (diff) | |
| download | aur-695b7abdec6077bf938ef6447b45fc8b99d6daa1.tar.gz | |
Remove Makefile patch and build without Makefile
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | ldflags.patch | 13 |
3 files changed, 11 insertions, 23 deletions
@@ -13,8 +13,6 @@ pkgbase = seaweedfs makedepends = git makedepends = go source = seaweedfs-2.70.tar.gz::https://github.com/chrislusf/seaweedfs/archive/2.70.tar.gz - source = ldflags.patch sha256sums = 3f7d3d4503aaae456f644bfea1250146fcb4d86d0b3ea3b6beb7cad6da9aada6 - sha256sums = 64db3c34767099aab8ec385c0b6796a2745ed66fa35159df0e8108da31e710db pkgname = seaweedfs @@ -9,16 +9,13 @@ arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h' 'arm') url="https://github.com/chrislusf/seaweedfs" license=('APACHE') makedepends=('git' 'go') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" - ldflags.patch) -sha256sums=('3f7d3d4503aaae456f644bfea1250146fcb4d86d0b3ea3b6beb7cad6da9aada6' - '64db3c34767099aab8ec385c0b6796a2745ed66fa35159df0e8108da31e710db') +source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") +sha256sums=('3f7d3d4503aaae456f644bfea1250146fcb4d86d0b3ea3b6beb7cad6da9aada6') +_shortcommit=cee4d20 prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../ldflags.patch - export GOPATH="${SRCDEST:-$srcdir}" go mod vendor } @@ -29,11 +26,17 @@ build() { export CGO_CXXFLAGS="$CXXFLAGS" export CGO_LDFLAGS="$LDFLAGS" export GOFLAGS="-buildmode=pie -trimpath -mod=vendor -modcacherw" + export GOPATH="${SRCDEST:-$srcdir}" - cd $pkgname-$pkgver - make GOPATH="${SRCDEST:-$srcdir}" + cd $pkgname-$pkgver/weed + go build -v $GO_FLAGS -ldflags "-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$_shortcommit -extldflags $LDFLAGS" } +#check() { +# cd $pkgname-$pkgver/weed +# go test -v +#} + package() { cd $pkgname-$pkgver install -D weed/weed "$pkgdir"/usr/bin/weed diff --git a/ldflags.patch b/ldflags.patch deleted file mode 100644 index 894e5bff6beb..000000000000 --- a/ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 59a3c46..1d285ed 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ deps: - rm -rf /home/travis/gopath/src/go.etcd.io/etcd/vendor/golang.org/x/net/trace - - build: deps -- go build $(GO_FLAGS) -ldflags "$(LDFLAGS)" -o $(BINARY) $(SOURCE_DIR) -+ go build $(GO_FLAGS) -ldflags "-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=${COMMIT} -extldflags $(LDFLAGS)" -o $(BINARY) $(SOURCE_DIR) - - linux: deps - mkdir -p linux |