Date: Sunday, November 27, 2022 @ 23:58:24
  Author: dvzrv
Revision: 462647

upgpkg: elfutils 0.188-1: Upgrade to 0.188.

Disable failing test (due to missing glibc debug package during test):
https://bugs.archlinux.org/task/74875
Simplify build() by moving configure options to a local array.
Add all available sodeps in the package() functions.
Move /etc/debuginfod/* and /etc/profile.d/* files to libelf, so debuginfod
works ootb with gdb: https://bugs.archlinux.org/task/73619
Minor style fixes.

Modified:
  elfutils/trunk/PKGBUILD

----------+
 PKGBUILD |   73 +++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-27 23:39:10 UTC (rev 462646)
+++ PKGBUILD    2022-11-27 23:58:24 UTC (rev 462647)
@@ -5,8 +5,8 @@
 
 pkgbase=elfutils
 pkgname=(debuginfod elfutils libelf)
-pkgver=0.187
-pkgrel=2
+pkgver=0.188
+pkgrel=1
 pkgdesc="Handle ELF object files and DWARF debugging information"
 arch=(x86_64)
 url="https://sourceware.org/elfutils/";
@@ -14,9 +14,9 @@
 makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib zstd)
 options=(debug staticlibs)
 
source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig})
-sha512sums=('a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874'
+sha512sums=('585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5'
             'SKIP')
-b2sums=('00ba3efa689d137808f5f53ecda93fd006be0c18d690ce76616ed1dba442281098579fa4b9a9e91b8ba865a3de15968f0ae06703a7b50b15c48a4beb5c970a46'
+b2sums=('6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4'
         'SKIP')
 validpgpkeys=(
   '47CC0331081B8BC6D0FD4DA08370665B57816A6A'  # Mark J. Wielaard 
<[email protected]>
@@ -34,9 +34,12 @@
 }
 
 prepare() {
+  # remove failing test due to missing glibc debug package during test: 
https://bugs.archlinux.org/task/74875
+  sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am
+
   (
-  cd $pkgbase-$pkgver
-  autoreconf -fiv
+    cd $pkgbase-$pkgver
+    autoreconf -fiv
   )
 
   cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver
@@ -44,27 +47,28 @@
 }
 
 build() {
+  local configure_options=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --program-prefix="eu-"
+    --enable-deterministic-archives
+  )
+
   (
-  # fat-lto-objects is required for non-mangled .a files in libelf
-  CFLAGS+=" -ffat-lto-objects"
-  cd $pkgbase-$pkgver
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --program-prefix="eu-" \
-              --enable-deterministic-archives
-  make
+    # fat-lto-objects is required for non-mangled .a files in libelf
+    CFLAGS+=" -ffat-lto-objects"
+    cd $pkgbase-$pkgver
+    ./configure "${configure_options[@]}"
+    make
   )
   (
-  cd $pkgbase-test-$pkgver
-  # debugging information is required for test-suite
-  CFLAGS+=" -g"
-  # fat-lto-objects is required for non-mangled .a files in libelf
-  CFLAGS+=" -ffat-lto-objects"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --program-prefix="eu-" \
-              --enable-deterministic-archives
-  make
+    cd $pkgbase-test-$pkgver
+    # debugging information is required for test-suite
+    CFLAGS+=" -g"
+    # fat-lto-objects is required for non-mangled .a files in libelf
+    CFLAGS+=" -ffat-lto-objects"
+    ./configure "${configure_options[@]}"
+    make
   )
 }
 
@@ -74,7 +78,14 @@
 
 package_debuginfod() {
   pkgdesc+=" (debuginfod)"
-  depends=(gcc-libs glibc libarchive.so libelf=$pkgver libmicrohttpd.so sqlite)
+  depends=(
+    gcc-libs
+    glibc
+    libarchive libarchive.so
+    libelf=$pkgver
+    libmicrohttpd libmicrohttpd.so
+    sqlite libsqlite3.so
+  )
   optdepends=("elfutils=$pkgver: for translations")
 
   make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver
@@ -86,6 +97,8 @@
   (
     cd "$pkgdir"
 
+    _pick libelf etc/debuginfod/*
+    _pick libelf etc/profile.d/*
     _pick libelf usr/{include,lib}
     _pick elfutils usr/bin/eu-*
     _pick elfutils usr/share/locale
@@ -105,7 +118,15 @@
 
 package_libelf() {
   pkgdesc+=" (libraries)"
-  depends=(gcc-libs libbz2.so libcurl.so xz zlib zstd)
+  depends=(
+    bzip2 libbz2.so
+    curl libcurl.so
+    gcc-libs
+    glibc
+    xz liblzma.so
+    zlib
+    zstd libzstd.so
+  )
   # NOTE: the shared objects can not be added to provides as they are not 
versioned
 
   mv -v libelf/* "$pkgdir"

Reply via email to