diff --git a/bloaty/.SRCINFO b/bloaty/.SRCINFO index b5c8577..00a4f13 100644 --- a/bloaty/.SRCINFO +++ b/bloaty/.SRCINFO @@ -1,17 +1,16 @@ pkgbase = bloaty pkgdesc = a size profiler for binaries pkgver = 1.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/google/bloaty arch = x86_64 - license = Apache + license = Apache-2.0 makedepends = cmake depends = gcc-libs depends = re2 depends = protobuf depends = capstone depends = abseil-cpp - options = !emptydirs source = https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2 source = https://src.fedoraproject.org/rpms/bloaty/raw/rawhide/f/bloaty-1.1-absl.patch sha256sums = a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f diff --git a/bloaty/PKGBUILD b/bloaty/PKGBUILD index b79e0a4..49d19e2 100644 --- a/bloaty/PKGBUILD +++ b/bloaty/PKGBUILD @@ -1,14 +1,13 @@ # Maintainer: Bert Peters pkgname=bloaty pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="a size profiler for binaries" arch=(x86_64) url="https://github.com/google/bloaty" -license=('Apache') +license=('Apache-2.0') depends=(gcc-libs re2 protobuf capstone abseil-cpp) makedepends=(cmake) -options=(!emptydirs) source=( "https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2" "https://src.fedoraproject.org/rpms/bloaty/raw/rawhide/f/bloaty-1.1-absl.patch") @@ -16,27 +15,25 @@ sha256sums=('a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f' '96cc0528f6464b03d0e68060ff2d24c36624c7d3991cee142df8d3d27cefeb51') prepare() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver" # Abseil compatibility patch borrowed from Fedora patch -p1 < "../bloaty-1.1-absl.patch" } build() { - cd "$pkgname-$pkgver" - # Bloaty doesn't allow using an empty build type. - # Unfortunately, this breaks RELRO, so we need to fix that - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" -Wno-dev . - make + cd "$pkgname-$pkgver" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" -Wno-dev + make } # Not included in the source tarbal, use the git release instead # check() { -# cd "$pkgname-$pkgver" -# make test +# cd "$pkgname-$pkgver" +# make test # } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install }