Skip to content
Permalink
Browse files
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: David Greaves <david.greaves@jollamobile.com>
  • Loading branch information
lbt committed Apr 24, 2013
1 parent 0ca2356 commit 9a5f0eca45769cb879f74dd07295520357c37283
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
@@ -1,3 +1,7 @@
* 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

0 comments on commit 9a5f0ec

Please sign in to comment.