From 6c7fa108b7559ccc35581efc8ee8562613f7d778 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 9 Nov 2019 09:16:58 -0600 Subject: [PATCH] libstatgrab: update to 0.92 --- srcpkgs/libstatgrab/patches/configure-musl.patch | 13 ------------- srcpkgs/libstatgrab/patches/os_info-musl.patch | 13 ------------- srcpkgs/libstatgrab/template | 7 ++++--- 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/libstatgrab/patches/configure-musl.patch delete mode 100644 srcpkgs/libstatgrab/patches/os_info-musl.patch diff --git a/srcpkgs/libstatgrab/patches/configure-musl.patch b/srcpkgs/libstatgrab/patches/configure-musl.patch deleted file mode 100644 index 81975d0cf16..00000000000 --- a/srcpkgs/libstatgrab/patches/configure-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -fix build failure with musl libc - ---- configure.ac 2015-07-28 23:01:23.742669306 -0300 -+++ configure.ac 2015-07-28 23:01:42.039440565 -0300 -@@ -609,7 +609,7 @@ - [openbsd*], [ - AC_DEFINE(OPENBSD, , [Building on OpenBSD]) - ], -- [linux-gnu*], [ -+ [linux-gnu*|linux-musl*], [ - AC_DEFINE(LINUX, , [Building on GNU/Linux]) - AM_CONDITIONAL(SETUIDBINS, true) - BIN_OWNER="root" diff --git a/srcpkgs/libstatgrab/patches/os_info-musl.patch b/srcpkgs/libstatgrab/patches/os_info-musl.patch deleted file mode 100644 index a6fb5a63239..00000000000 --- a/srcpkgs/libstatgrab/patches/os_info-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -musl doesn't support _SC_LONG_BIT, just use the value from limits.h - ---- src/libstatgrab/os_info.c 2015-07-28 23:27:05.860119689 -0300 -+++ src/libstatgrab/os_info.c 2015-07-28 23:27:22.931906262 -0300 -@@ -472,7 +472,7 @@ - host_info_buf->bitwidth = 64; - } - else { -- host_info_buf->bitwidth = sysconf(_SC_LONG_BIT); // well, maybe 64-bit disabled 128-bit system o.O -+ host_info_buf->bitwidth = LONG_BIT; - } - host_info_buf->host_state = sg_unknown_configuration; - # endif diff --git a/srcpkgs/libstatgrab/template b/srcpkgs/libstatgrab/template index aa8d1f0a1f1..0b9ce3b0b57 100644 --- a/srcpkgs/libstatgrab/template +++ b/srcpkgs/libstatgrab/template @@ -1,7 +1,7 @@ # Template file for 'libstatgrab' pkgname=libstatgrab -version=0.91 -revision=3 +version=0.92 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="autoconf" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="http://www.i-scream.org/libstatgrab" distfiles="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=03e9328e4857c2c9dcc1b0347724ae4cd741a72ee11acc991784e8ef45b7f1ab +checksum=5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DLINUX -DHAVE_PROCFS" ;; @@ -25,6 +25,7 @@ libstatgrab-devel_package() { depends="${sourcepkg}-${version}_${revision}" short_desc+=" -- development files" pkg_install() { + vmove usr/bin/statgrab-make* vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so"