From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master

Adjust grep expression used in lighttpd Makefile to filter out

On some host systems (used to build) ldd tool returns list with invalid pointers
like so (the first line being the example):

        linux-vdso.so.1 =>  (0x00007ffc31fce000)
        libpcre.so.3 => /lib/x86_64-linux-gnu/libpcre.so.3 (0x00007fdea8035000)
        libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007fdea7e31000)
        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007fdea7a66000)
libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007fdea7849000)
        /lib64/ld-linux-x86-64.so.2 (0x000055e5b2db0000)

This patch refines grep expression to remove lines like so.

Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
Message-Id: <1500295438-30272-1-git-send-email-jwkozac...@gmail.com>

---
diff --git a/lighttpd/Makefile b/lighttpd/Makefile
--- a/lighttpd/Makefile
+++ b/lighttpd/Makefile
@@ -10,7 +10,7 @@ module: usr.manifest
 usr.manifest: $(SRC)/lighttpd.so
        echo '[manifest]' > usr.manifest
        echo '/lighttpd.so: $${MODULE_DIR}/$(SRC)/lighttpd.so' >> usr.manifest
-       ldd $(SRC)/lighttpd.so | grep -v 'libc.so\|libpthread.so\|libdl.so' |\
+ ldd $(SRC)/lighttpd.so | grep -v 'libc.so\|libpthread.so\|libdl.so\| =>\W*(' |\
                sed -n 's/ *[^ ] *\(.*\) => \(.*\) .*/\/\1: \2/p' \
                >> usr.manifest
ls upstream/lighttpd/src/.libs/*.so | sed 's/\(.*\)\/mod_\(.*\)/\/lighttpd\/lib\/mod_\2: $${MODULE_DIR}\/upstream\/lighttpd\/src\/.libs\/mod_\2/' >> usr.manifest

--
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to