From 7ad8d5a3d923ff7a9f30b9257f2758039823d985 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Thu, 6 Dec 2018 18:08:05 +0100 Subject: [PATCH 1/3] 1.0 release. --- .SRCINFO | 14 ++++++++++++++ PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..2eda560 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,14 @@ +pkgbase = bloaty + pkgdesc = a size profiler for binaries + pkgver = 1.0 + pkgrel = 1 + url = https://github.com/google/bloaty + arch = x86_64 + license = Apache + makedepends = cmake + depends = gcc-libs + source = https://github.com/google/bloaty/releases/download/v1.0/bloaty-1.0.tar.bz2 + sha256sums = e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0 + +pkgname = bloaty + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..5c88705 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Bert Peters +pkgname=bloaty +pkgver=1.0 +pkgrel=1 +pkgdesc="a size profiler for binaries" +arch=(x86_64) +url="https://github.com/google/bloaty" +license=('Apache') +depends=(gcc-libs zlib) +makedepends=(cmake) +source=("https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2") +sha256sums=('e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0') + +build() { + cd "$pkgname-$pkgver" + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make +} + +# Not included in the source tarbal, use the git release instead +# check() { +# cd "$pkgname-$pkgver" +# make test +# } + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + # Prevent a conflict with regular protobuf + rm "$pkgdir/usr/bin/protoc"* + + # Don't cause conflicts with our static libraries + rm -rf "$pkgdir/usr/"{include,lib64} "$pkgdir/usr/lib/libre2.a" +} From 3d100f43e4a111709b55c3f7e50515fa34cbee5e Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 2 Sep 2019 16:42:45 +0200 Subject: [PATCH 2/3] Fix conflicts and relro issues. --- .SRCINFO | 3 ++- PKGBUILD | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2eda560..84f5e2e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,13 @@ pkgbase = bloaty pkgdesc = a size profiler for binaries pkgver = 1.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/google/bloaty arch = x86_64 license = Apache makedepends = cmake depends = gcc-libs + options = !emptydirs source = https://github.com/google/bloaty/releases/download/v1.0/bloaty-1.0.tar.bz2 sha256sums = e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0 diff --git a/PKGBUILD b/PKGBUILD index 5c88705..38f84a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,19 +1,23 @@ # Maintainer: Bert Peters pkgname=bloaty pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="a size profiler for binaries" arch=(x86_64) url="https://github.com/google/bloaty" license=('Apache') -depends=(gcc-libs zlib) +depends=(gcc-libs) makedepends=(cmake) +options=(!emptydirs) source=("https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2") sha256sums=('e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0') build() { cd "$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr . + # 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 } @@ -26,9 +30,7 @@ build() { package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - # Prevent a conflict with regular protobuf - rm "$pkgdir/usr/bin/protoc"* - # Don't cause conflicts with our static libraries - rm -rf "$pkgdir/usr/"{include,lib64} "$pkgdir/usr/lib/libre2.a" + # Prevent package conflicts + rm -r "$pkgdir/usr/"{include,bin/protoc*,lib64,lib/*.a,lib/pkgconfig/protobuf*,lib/cmake/protobuf} } From b853017f5981f0afcb4129ab9085fa139679fd50 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Sun, 24 May 2020 13:01:53 +0200 Subject: [PATCH 3/3] Update to v1.1. Now a lot smaller since it uses system dependencies. --- .SRCINFO | 11 +++++++---- PKGBUILD | 11 ++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 84f5e2e..a30a331 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,18 @@ pkgbase = bloaty pkgdesc = a size profiler for binaries - pkgver = 1.0 - pkgrel = 2 + pkgver = 1.1 + pkgrel = 1 url = https://github.com/google/bloaty arch = x86_64 license = Apache makedepends = cmake depends = gcc-libs + depends = re2 + depends = protobuf + depends = capstone options = !emptydirs - source = https://github.com/google/bloaty/releases/download/v1.0/bloaty-1.0.tar.bz2 - sha256sums = e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0 + source = https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2 + sha256sums = a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f pkgname = bloaty diff --git a/PKGBUILD b/PKGBUILD index 38f84a2..5cc4024 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Bert Peters pkgname=bloaty -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc="a size profiler for binaries" arch=(x86_64) url="https://github.com/google/bloaty" license=('Apache') -depends=(gcc-libs) +depends=(gcc-libs re2 protobuf capstone) makedepends=(cmake) options=(!emptydirs) source=("https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2") -sha256sums=('e1cf9830ba6c455218fdb50e7a8554ff256da749878acfaf77c032140d7ddde0') +sha256sums=('a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f') build() { cd "$pkgname-$pkgver" @@ -30,7 +30,4 @@ build() { package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - - # Prevent package conflicts - rm -r "$pkgdir/usr/"{include,bin/protoc*,lib64,lib/*.a,lib/pkgconfig/protobuf*,lib/cmake/protobuf} }