liblol: search lol libs before all other pathes

We put lol libs and other necessary libs which need to be preferred
before executables' RPATH and LD_LIBRARY_PATH.

Also provide /opt/lol/local/preload-lib and /opt/lol/local/lib for our
users to add their own libs.

Author: shankerwangmiao

autobuild/build

@@ -61,8 +61,8 @@ rootsbindir = \${exec_prefix}/sbin
 complocaledir = /usr/lib/locale
 localtime-file = /etc/localtime
 sysconfdir = $LOLPREFIX/etc
-user-defined-trusted-dirs-pre = $LOLPREFIX/support/lib/$OWTARGET
-user-defined-trusted-dirs = $LOLPREFIX/lib/$OWTARGET $LOLPREFIX/lib
+user-defined-trusted-dirs-pre = $LOLPREFIX/local/preload-lib $LOLPREFIX/support/lib/$OWTARGET
+user-defined-trusted-dirs = $LOLPREFIX/local/lib $LOLPREFIX/lib/$OWTARGET $LOLPREFIX/lib
 
 CFLAGS = -pipe $cflags_common
 ASFLAGS = -pipe $cflags_common
@@ -195,5 +195,11 @@ abinfo "Building Glibc ..."
 glibc_source
 glibc_build
 
+abinfo "Making symlinks for system provided libs ..."
+system_libs_prio=("/usr/lib/libstdc++.so.6")
+for i in "${system_libs_prio[@]}"; do
+    ln -sfv "$i" "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/"
+done
+
 abinfo "Installing package hooks ..."
 install_hooks

autobuild/patches/glibc/0009-able-to-prepend-trusted-dirs.patch

@@ -0,0 +1,95 @@
+From ab1f75bb30336948c3de6a8355994314b3fdc4a3 Mon Sep 17 00:00:00 2001
+From: Miao Wang <[email protected]>
+Date: Sun, 14 Jan 2024 13:28:41 +0800
+Subject: [PATCH 09/10] prepend trusted-dirs
+
+and search prepended trusted-dirs before other pathes
+---
+ elf/Makefile  |  3 ++-
+ elf/dl-load.c | 26 ++++++++++++++++++++++++--
+ 2 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index c00e2ccf..ed1f709c 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -1355,9 +1355,10 @@ endif
+ $(objpfx)trusted-dirs.h: $(objpfx)trusted-dirs.st; @:
+ $(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig
+ 	$(make-target-directory)
+-	echo "$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))"    \
++	echo "$(subst :, ,$(user-defined-trusted-dirs-pre) $(default-rpath) $(user-defined-trusted-dirs))"    \
+ 	| $(AWK) -f gen-trusted-dirs.awk > ${@:st=T};
+ 	echo '#define DL_DST_LIB "$(notdir $(slibdir))"' >> ${@:st=T}
++	echo '#define SYSTEM_DIRS_PRE_COUNT $(words $(subst :, ,$(user-defined-trusted-dirs-pre)))' >> ${@:st=T}
+ 	$(move-if-change) ${@:st=T} ${@:st=h}
+ 	touch $@
+ CPPFLAGS-dl-load.c += -I$(objpfx). -I$(csu-objpfx).
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 9a87fda9..d11309f2 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -123,6 +123,9 @@ static const size_t system_dirs_len[] =
+   SYSTEM_DIRS_LEN
+ };
+ #define nsystem_dirs_len array_length (system_dirs_len)
++#define normal_system_dirs_len (nsystem_dirs_len - SYSTEM_DIRS_PRE_COUNT)
++
++static_assert (SYSTEM_DIRS_PRE_COUNT < nsystem_dirs_len, "should have at least one system dir");
+ 
+ static bool
+ is_trusted_path_normalize (const char *path, size_t len)
+@@ -723,7 +726,7 @@ _dl_init_paths (const char *llp, const char *source,
+ 
+   /* First set up the rest of the default search directory entries.  */
+   aelem = __rtld_search_dirs.dirs = (struct r_search_path_elem **)
+-    malloc ((nsystem_dirs_len + 1) * sizeof (struct r_search_path_elem *));
++    malloc ((nsystem_dirs_len + 2) * sizeof (struct r_search_path_elem *));
+   if (__rtld_search_dirs.dirs == NULL)
+     {
+       errstring = N_("cannot create search path array");
+@@ -748,11 +751,17 @@ _dl_init_paths (const char *llp, const char *source,
+   pelem = GL(dl_all_dirs) = __rtld_search_dirs.dirs[0];
+   strp = system_dirs;
+   idx = 0;
++  aelem = &__rtld_search_dirs.dirs[normal_system_dirs_len + 1];
+ 
+   do
+     {
+       size_t cnt;
+ 
++      if (aelem == &__rtld_search_dirs.dirs[nsystem_dirs_len + 1]){
++        *aelem = NULL;
++        aelem = &__rtld_search_dirs.dirs[0];
++      }
++
+       *aelem++ = pelem;
+ 
+       pelem->what = "system search path";
+@@ -2022,9 +2031,22 @@ _dl_map_object (struct link_map *loader, const char *name,
+ 
+       fd = -1;
+ 
++      if (SYSTEM_DIRS_PRE_COUNT > 0
++          && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
++          || __glibc_likely (!(l->l_flags_1 & DF_1_NODEFLIB)))
++          && __rtld_search_dirs.dirs != (void *) -1)
++        {
++          struct r_search_path_struct pre_sp = {
++            .dirs = &__rtld_search_dirs.dirs[normal_system_dirs_len + 1],
++            .malloced = 0,
++          };
++          fd = open_path (name, namelen, mode, &pre_sp,
++              &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
++        }
++
+       /* When the object has the RUNPATH information we don't use any
+ 	 RPATHs.  */
+-      if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL)
++      if (fd == -1 && (loader == NULL || loader->l_info[DT_RUNPATH] == NULL))
+ 	{
+ 	  /* This is the executable's map (if there is one).  Make sure that
+ 	     we do not look at it twice.  */
+-- 
+2.43.0
+

autobuild/patches/glibc/0009-prepend-trusted-dirs.patch

@@ -1,4 +1,4 @@
-From c2ef1e7fe9b5c0cec43197e440cc5b4a05bbde24 Mon Sep 17 00:00:00 2001
+From 8f53c5c593728dee6391cc064a1ebf89e3d70dd8 Mon Sep 17 00:00:00 2001
 From: Miao Wang <[email protected]>
 Date: Mon, 15 Jan 2024 04:16:47 +0800
 Subject: [PATCH 10/10] Add ___brk_addr symbol

autobuild/patches/glibc/0010-Add-___brk_addr-symbol.patch

@@ -6,5 +6,5 @@
 0006-add-syscall-fallback-for-stat-at.patch
 0007-add-more-pthread-symbols.patch
 0008-remove-clone3-for-compatibility-with-qq.patch
-0009-able-to-prepend-trusted-dirs.patch
+0009-prepend-trusted-dirs.patch
 0010-Add-___brk_addr-symbol.patch