summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-03-09 00:45:46 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-03-09 00:45:46 +0300
commit930df2e58b9725756edbccf99fd4979026fc28fd (patch)
tree8c5fa9f20219e9bc4580bb18e03b8dd8043a9a4f /poky/meta/recipes-core/glibc
parent7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c (diff)
parent377d8f40e88eeb9ccb1321590a3af3c2caa94dda (diff)
downloadopenbmc-930df2e58b9725756edbccf99fd4979026fc28fd.tar.xz
Merge tag '0.35' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-core/glibc')
-rw-r--r--poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/no-aux-cache.patch19
-rw-r--r--poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb1
2 files changed, 20 insertions, 0 deletions
diff --git a/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/no-aux-cache.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/no-aux-cache.patch
new file mode 100644
index 000000000..c6765ba00
--- /dev/null
+++ b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/no-aux-cache.patch
@@ -0,0 +1,19 @@
+The ldconfig auxiliary cache is a dictionary where the keys include inode, so
+there is no point in writing these files on the build host.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/ldconfig.c b/ldconfig.c
+index 2c4eb57..2d6dc92 100644
+--- a/ldconfig.c
++++ b/ldconfig.c
+@@ -1399,8 +1399,6 @@ main (int argc, char **argv)
+ if (opt_build_cache)
+ {
+ save_cache (cache_file);
+- if (aux_cache_file)
+- save_aux_cache (aux_cache_file);
+ }
+
+ return 0;
diff --git a/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 93c0b1867..919d11417 100644
--- a/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://ldconfig-default-to-all-multilib-dirs.patch \
file://endian-ness_handling_fix.patch \
file://add-64-bit-flag-for-ELF64-entries.patch \
+ file://no-aux-cache.patch \
"
PR = "r2"