Commit 9a5f0eca authored by lbt's avatar lbt Committed by David Greaves

Ensure /etc/ld.so.conf contains absolute path to include files.

ld.so.conf must use absolute paths when being called using -r
This happens when using scratchbox2 with x86 targets.

See elf/ldconfig.c around line 1039
Signed-off-by: default avatarDavid Greaves <david.greaves@jollamobile.com>
parent 0ca23563
* Wed Apr 24 2013 David Greaves <david@dgreaves.com> - 2.15
- ld.so.conf must use absolute paths when being called using -r
This happens when using scratchbox2 with x86 targets.
* Mon Mar 18 2013 Juha Kallioinen <juha.kallioinen@jollamobile.com> - 2.15
- If available, use /usr/bin/localedef in qemu builds
......
......@@ -332,7 +332,7 @@ install -m 644 nscd/nscd.conf $RPM_BUILD_ROOT/etc
rm -f $RPM_BUILD_ROOT/etc/ld.so.cache
# Include ld.so.conf
echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT/etc/ld.so.conf
echo 'include /etc/ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT/etc/ld.so.conf
> $RPM_BUILD_ROOT/etc/ld.so.cache
chmod 644 $RPM_BUILD_ROOT/etc/ld.so.conf
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment