From 1df8080970da3754549cccd9b3eefdcd8f2afb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 11 Mar 2021 19:13:26 +0700 Subject: [PATCH] i3status: use system glob(3) on musl GLOB_TILDE is supported in musl 1.1.24+ --- srcpkgs/i3status/template | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template index 9474d13234b..5ef9f206834 100644 --- a/srcpkgs/i3status/template +++ b/srcpkgs/i3status/template @@ -1,9 +1,9 @@ # Template file for 'i3status' pkgname=i3status version=2.13 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-builddir $(vopt_if pulseaudio '' --disable-pulseaudio)" +configure_args="--disable-builddir $(vopt_enable pulseaudio)" hostmakedepends="automake asciidoc pkg-config xmlto" makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel yajl-devel $(vopt_if pulseaudio pulseaudio-devel)" @@ -20,25 +20,6 @@ conf_files="/etc/i3status.conf" build_options="pulseaudio" build_options_default="pulseaudio" -case "$XBPS_TARGET_MACHINE" in - *-musl) - makedepends+=" libglob-devel" - export LIBS="${XBPS_CROSS_BASE}/usr/lib/libglob.a" - ;; -esac - -post_patch() { - case "$XBPS_TARGET_MACHINE" in - *-musl) - vsed \ - -e '/include/s,glob.h,libglob/glob.h,g' \ - -e '/GLOB_TILDE/s/glob(/g_glob(/g' \ - -e 's/globfree(/g_globfree(/g' \ - -i src/process_runs.c src/print_cpu_temperature.c i3status.c - ;; - esac -} - pre_configure() { autoreconf -vfi }