[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/client
From:       Stephan Kulow <coolo () kde ! org>
Date:       2009-02-15 13:39:00
Message-ID: 1234705140.969129.24145.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 926473 by coolo:

another patch by Michal Schmidt:
 In Fedora ld.so.conf contains an include directive with a relative path.
 ldconfig does not accept relative include paths when using -r.
 Instead of copying ld.so.conf verbatim, make a modified copy of it where
 relative paths are replaced with absolute to make ldconfig happy.


 M  +12 -1     icecc-create-env  


--- trunk/icecream/client/icecc-create-env #926472:926473
@@ -117,8 +117,18 @@
 if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then
   add_file "$specfile"
 fi
-add_file /etc/ld.so.conf
 
+# for ldconfig -r to work, ld.so.conf must not contain relative paths
+# in include directives. Make them absolute.
+tmp_ld_so_conf=`mktemp /tmp/icecc_ld_so_confXXXXXX`
+while read directive path; do
+  if [ "$directive" = "include" -a "${path:0:1}" != "/" ]; then
+    path="/etc/$path"
+  fi
+  echo "$directive $path"
+done </etc/ld.so.conf >$tmp_ld_so_conf
+add_file $tmp_ld_so_conf /etc/ld.so.conf
+
 tempdir=`mktemp -d /tmp/iceccenvXXXXXX`
 # special case for weird multilib setups
 for dir in /lib /lib64 /usr/lib /usr/lib64; do
@@ -175,3 +185,4 @@
 }
 cd ..
 rm -rf $tempdir
+rm -f $tmp_ld_so_conf
[prev in list] [next in list] [prev in thread] [next in thread]