From eb5f2600cdd576a8def60143bdb2d9a8118a5aea Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 2 Dec 2023 19:20:56 -0800 Subject: Rebuild against libsodium 1.0.19 Fix broken lto --- PKGBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 9c3dc71..1ded2ef 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=dnscrypt-wrapper pkgver=0.4.2 -pkgrel=3 +pkgrel=4.2 pkgdesc="A server-side dnscrypt proxy" url="https://dnscrypt.org/" arch=('x86_64') @@ -15,6 +15,9 @@ license=('BSD') depends=('libsodium' 'libevent') backup=('etc/default/dnscrypt-wrapper') install=dnscrypt-wrapper.install +# # For some reason this breaks compiling. "error: C++ compiler cannot create executables" +# # But old-fashioned raw injection of -flto=auto via export doesn't. +#options=(lto) source=("$pkgname-$pkgver.tar.gz::https://github.com/cofyc/dnscrypt-wrapper/archive/v$pkgver.tar.gz" "${pkgname}.sysusers") sha512sums=('f45afc6e0468c48ad9ded54cfd7d5314c68d49afda5faf3c7c3b6f8f41f77501565967ba6666f3723ba735c8d7f8d98a7777010a4fcf215b3d76707411243400' @@ -22,8 +25,8 @@ sha512sums=('f45afc6e0468c48ad9ded54cfd7d5314c68d49afda5faf3c7c3b6f8f41f77501565 build() { cd $pkgname-$pkgver - export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4 -fPIE" - export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4 -fPIE" + export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto -fPIE" + export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto -fPIE" export LDFLAGS="$LDFLAGS,-pie" make configure ./configure @@ -41,8 +44,7 @@ package() { make sbindir="$pkgdir"/usr/bin install install -Dm644 debian/dnscrypt-wrapper.default "$pkgdir"/etc/default/dnscrypt-wrapper - install -Dm644 "${srcdir}/${pkgname}.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf" + install -Dm644 "${srcdir}/${pkgname}.sysusers" "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf" install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING install -Dm644 debian/dnscrypt-wrapper.8 "$pkgdir"/usr/share/man/man8/dnscrypt-wrapper.8 -- cgit v1.2.1