summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-04-17 18:10:33 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-18 15:56:41 +0200
commit1c4d3555f4e810e8268b5e1b98cc09de0cbce885 (patch)
treefcff6d63955a5fd6ec2abc1fb16880e23679535d
parentd0185fcc6dd13d74f44c76ee163824beb025b39b (diff)
downloadbuildroot-1c4d3555f4e810e8268b5e1b98cc09de0cbce885.tar.gz
buildroot-1c4d3555f4e810e8268b5e1b98cc09de0cbce885.zip
target-finalize: fix calling ldconfig
On some systems (e.g. Fedora 20), the build breaks when parsing include directives in our /etc/ld.so.conf, with error messages as thus: /sbin/ldconfig: need absolute file name for configuration file when using -r So, enforce the path to the ld.so.conf file to point to our own, in the target/ directory. Reported-by: Al West <al.west@v-nova.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6a28b2824d..d1d6ab33e6 100644
--- a/Makefile
+++ b/Makefile
@@ -583,9 +583,11 @@ endif
mkdir -p $(TARGET_DIR)/var/cache/ldconfig
if [ -x "$(TARGET_CROSS)ldconfig" ]; \
then \
- $(TARGET_CROSS)ldconfig -r $(TARGET_DIR); \
+ $(TARGET_CROSS)ldconfig -r $(TARGET_DIR) \
+ -f $(TARGET_DIR)/etc/ld.so.conf; \
else \
- /sbin/ldconfig -r $(TARGET_DIR); \
+ /sbin/ldconfig -r $(TARGET_DIR) \
+ -f $(TARGET_DIR)/etc/ld.so.conf; \
fi
( \
echo "NAME=Buildroot"; \
OpenPOWER on IntegriCloud