Create "ld.so.cache" even despite "-n" given
authorshort <>
Sat, 22 Sep 2001 04:23:56 +0000 (04:23 +0000)
committershort <>
Sat, 22 Sep 2001 04:23:56 +0000 (04:23 +0000)
  - required to create cache file without any default directories
  ftp://sunsite.mff.cuni.cz/MIRRORS/ftp.redhat.com/redhat/linux/6.2/en/os/i386/SRPMS/ldconfig-1.9.5-16.src.rpm

src/ldconfig-1999-02-21-prep-docache.diff [new file with mode: 0644]

diff --git a/src/ldconfig-1999-02-21-prep-docache.diff b/src/ldconfig-1999-02-21-prep-docache.diff
new file mode 100644 (file)
index 0000000..68fccc5
--- /dev/null
@@ -0,0 +1,35 @@
+ftp://sunsite.mff.cuni.cz/MIRRORS/ftp.redhat.com/redhat/linux/6.2/en/os/i386/SRPMS/ldconfig-1.9.5-16.src.rpm
+
+diff -ru ldconfig-1999-02-21-prep-orig/ldconfig.c ldconfig-1999-02-21-prep/ldconfig.c
+--- ldconfig-1999-02-21-prep-orig/ldconfig.c   Fri Jun 29 21:06:47 2001
++++ ldconfig-1999-02-21-prep/ldconfig.c        Fri Jun 29 21:11:22 2001
+@@ -624,7 +624,7 @@
+           break;
+       case 'n':
+           nodefault = 1;      /* no default dirs */
+-          nocache = 1;
++          /* nocache = 1; * Lace */
+           break;
+       case 'N':
+           nocache = 1;        /* don't build cache */
+@@ -707,16 +707,20 @@
+     {
+       /* the lazy bum want's us to do all the work for him */
++#if 0 /* Lace */
+       /* don't cache dirs on the command line */
+       int nocache_save = nocache;
+       nocache = 1;
++#endif
+       /* OK, which directories should we do? */
+       for (i = optind; i < argc; i++)
+           scan_dir(argv[i]);
++#if 0 /* Lace */
+       /* restore the desired caching state */
+       nocache = nocache_save;
++#endif
+       /* look ma, no defaults */
+       if (!nodefault)