diff --git a/glibc.changes b/glibc.changes index 986890f..32b63f7 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,7 @@ +* Wed Apr 24 2013 David Greaves - 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 - 2.15 - If available, use /usr/bin/localedef in qemu builds diff --git a/glibc.spec b/glibc.spec index fec49f5..f2ccfbc 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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