From 359fd986fd67956560fa7317bd7a5cc21f8f2eb4 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 27 Jul 2019 02:44:57 +0200 Subject: [PATCH] xbps-src: add XBPS_LIBC/XBPS_TARGET_LIBC This can be used in template checks to remove the clunky case statements and pattern matching, as well as simplify normal ifs. For example: if [ "${XBPS_TARGET_MACHINE%-musl}" = "${XBPS_TARGET_MACHINE}" ]; then ... glibc specific ... fi becomes: if [ "${XBPS_TARGET_LIBC}" = "glibc" ]; then ... glibc specific ... fi --- common/xbps-src/shutils/common.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 146d4e0604d..6aa9ad14d7e 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -312,6 +312,18 @@ setup_pkg() { XBPS_CHECKVERS_XCMD="$XBPS_CHECKVERS_CMD" fi + if [ "${XBPS_MACHINE%-*}" = "${XBPS_MACHINE}" ]; then + export XBPS_LIBC="glibc" + else + export XBPS_LIBC="${XBPS_MACHINE#*-}" + fi + + if [ "${XBPS_TARGET_MACHINE%-*}" = "${XBPS_TARGET_MACHINE}" ]; then + export XBPS_TARGET_LIBC="glibc" + else + export XBPS_TARGET_LIBC="${XBPS_TARGET_MACHINE#*-}" + fi + export XBPS_INSTALL_XCMD XBPS_QUERY_XCMD XBPS_RECONFIGURE_XCMD \ XBPS_REMOVE_XCMD XBPS_RINDEX_XCMD XBPS_UHELPER_XCMD