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

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream/client
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2004-10-01 17:47:28
Message-ID: 20041001174728.345899970 () office ! kde ! org
[Download RAW message or body]

CVS commit by helio: 

Change old regexp to match all cases on current nptl glibc

ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc
this regexp parse the outputs like:

ldd /usr/bin/gcc
		linux-gate.so.1 =>  (0xffffe000)
		libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
		/lib/ld-linux.so.2 (0xb7fe8000)

covering both situations ( with => and without )


  M +8 -1      create-env   1.13


--- kdenonbeta/icecream/icecream/client/create-env  #1.12:1.13
@@ -35,5 +35,12 @@
     # Only call ldd when it makes sense
     if file "$path" | grep 'ELF' > /dev/null 2>&1 ; then
-      for lib in `ldd "$path" | sed -n 's/^.*=> \([^ ]*\).*$/\1/p'`; do
+           # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc
+                # this regexp parse the outputs like:
+                # ldd /usr/bin/gcc
+                #         linux-gate.so.1 =>  (0xffffe000)
+                #         libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
+                #         /lib/ld-linux.so.2 (0xb7fe8000)
+                # covering both situations ( with => and without )
+      for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do
         add_file "$lib"
       done


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