From de021ef240526c55544fa0384319471f699dd77d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Tue, 4 May 2021 15:54:24 -0300
Subject: [PATCH] recipes: libs/musl-compat: Minor adjustments for the musl
 compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 recipes/libs/musl-compat/recipe | 17 ++++++++++++++++-
 recipes/libs/musl/recipe        |  6 ------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/recipes/libs/musl-compat/recipe b/recipes/libs/musl-compat/recipe
index 1d54b78c..cc796b16 100644
--- a/recipes/libs/musl-compat/recipe
+++ b/recipes/libs/musl-compat/recipe
@@ -19,7 +19,7 @@ set -e
 
 program=musl-compat
 version=20210503_77a1509
-release=1
+release=2
 
 # Define a category for the output of the package name
 pkgcategory=libs
@@ -63,6 +63,21 @@ build()
     make -j${jobs} V=1 \
      prefix=/usr CFLAGS="$QICFLAGS" DESTDIR="$destdir" install
 
+    # This should be part of usr/sbin
+    rm -f "${destdir}/usr/bin/ldconfig"
+
+    strip --strip-unneeded "${destdir}"/usr/bin/* || true
+
+    # Write a better version of dummy "ldconfig"
+    mkdir -p "${destdir}"/usr/sbin
+    cat << EOF > "${destdir}"/usr/sbin/ldconfig
+#! /bin/sh -
+
+true
+
+EOF
+    chmod 755 "${destdir}"/usr/sbin/ldconfig
+
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
 }
diff --git a/recipes/libs/musl/recipe b/recipes/libs/musl/recipe
index 11bc90e4..c192f870 100644
--- a/recipes/libs/musl/recipe
+++ b/recipes/libs/musl/recipe
@@ -143,12 +143,6 @@ EOF
 
     unset -v ld_path
 
-    mkdir -p "${destdir}"/usr/sbin
-    cat << EOF > "${destdir}"/usr/sbin/ldconfig
-#! /bin/true -
-EOF
-    chmod 755 "${destdir}"/usr/sbin/ldconfig
-
     # Copy documentation
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
-- 
2.11.4.GIT