From ef24c33ed66c71448ccd7db4b091fb0209696bcc Mon Sep 17 00:00:00 2001
From: Niels Breet <niels.breet@jolla.com>
Date: Fri, 6 Dec 2019 16:04:42 +0200
Subject: [PATCH] [glibc] Remove hardcoded libdir for aarch64. Contributes to
 JB#47986

---
 glibc.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 3b85ef8..cea6e8f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -288,11 +288,9 @@ build()
 %if %{with bootstrap}
 		--without-selinux \
 %endif
-                libc_cv_slibdir=/lib ||
+                ||
 		{ cat config.log; false; }
 
-# Note: We need /lib instead of /lib64 for aarch64, so we force it here
-
 	make %{?_smp_mflags} -O -r CFLAGS="$build_CFLAGS"
 	popd
 }
@@ -918,7 +916,7 @@ cat master.filelist | grep '/libnss_[a-z]*\.so$' master.filelist >> devel.fileli
 # remove nss db Makefile
 rm %{glibc_sysroot}/var/db/Makefile
 # remove libnsl
-rm %{glibc_sysroot}/lib/libnsl*
+rm %{glibc_sysroot}/%{_lib}/libnsl*
 
 ##############################################################################
 # Delete files that we do not intended to ship with the auxarch.