summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-07-22 20:17:48 -0400
committerMax Rees <maxcrees@me.com>2019-07-22 20:17:48 -0400
commitce2e525633866b015dcf4e85abfb991e4aebcf09 (patch)
tree562e2f89e4d2c95c0b11c1bc3ed35b4c83b2f90f /system
parent2707df6cc761dcc2341faa8bafec5b4b4fa33e4d (diff)
downloadpackages-ce2e525633866b015dcf4e85abfb991e4aebcf09.tar.gz
packages-ce2e525633866b015dcf4e85abfb991e4aebcf09.tar.bz2
packages-ce2e525633866b015dcf4e85abfb991e4aebcf09.tar.xz
packages-ce2e525633866b015dcf4e85abfb991e4aebcf09.zip
system/musl: remove |& bashism from ldconfig
Diffstat (limited to 'system')
-rw-r--r--system/musl/APKBUILD4
-rw-r--r--system/musl/ldconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD
index 73bfea8b5..336d81458 100644
--- a/system/musl/APKBUILD
+++ b/system/musl/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=musl
pkgver=1.1.23
-pkgrel=0
+pkgrel=1
pkgdesc="System library (libc) implementation"
url="https://www.musl-libc.org/"
arch="all"
@@ -123,6 +123,6 @@ ef532aebeaa89b3274f7f75f1adaa4d1eea60f4e2822a6711c748768cc3a65a77ebd218d7a8ab411
ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch
fda015fad0d0a65efb192c08d201b2f5b2bfff18c43b551855b119a1d63213bd417a93a6b2965e68243884c5b17b34a585795cc4cace603788d37149e933cfb1 powerpc-wchar_t.patch
7ed6c620a5ea5585c323936b1ff01eb7f01a1192240706a0d0470b661a7a03ea10ed17507c59678aaedce51b7a5ea839c2f528f19f12de02119bf4e47f7c3998 strftime-add-l-support.patch
-cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig
+cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig
378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c
9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c"
diff --git a/system/musl/ldconfig b/system/musl/ldconfig
index 7699c6722..991927bae 100644
--- a/system/musl/ldconfig
+++ b/system/musl/ldconfig
@@ -18,11 +18,11 @@ msg() {
}
musl_arch() {
- $ROOT/usr/lib/libc.so |& sed -n 's/^musl libc (\(.*\))$/\1/p'
+ $ROOT/usr/lib/libc.so 2>&1 | sed -n 's/^musl libc (\(.*\))$/\1/p'
}
musl_version() {
- $ROOT/usr/lib/libc.so |& sed -n 's/^Version //p'
+ $ROOT/usr/lib/libc.so 2>&1 | sed -n 's/^Version //p'
}
read_ldso_conf() {