On Thu, 2008-07-10 at 17:33 +0100, Neil Williams wrote: > Fix for a build failure in the gtk+ udeb which cannot find the > libcairo-directfb headers because dpkg-cross shortens A second part of the same fix, this time for the .so file and links: Index: dpkg-cross =================================================================== RCS file: /cvsroot/dpkg-cross/dpkg-cross/dpkg-cross,v retrieving revision 1.51 diff -p -u -b -B -r1.51 dpkg-cross --- dpkg-cross 10 Jul 2008 19:00:52 -0000 1.51 +++ dpkg-cross 10 Jul 2008 21:18:08 -0000 @@ -559,6 +559,11 @@ sub sub_build { } elsif (/^\/usr(\/X11R6)?\/lib32\/([^\/]+\.[ao])$/) { # regular .a or .o file under /usr/lib32 or /usr/X11R6/lib32 link_file("$src$_", "$dst$crosslib32/$2") or goto fail; + } elsif (m:^/usr/lib/([\w\-/]+)/lib/([^/]+\.so[^/]*)$:) { + # regular .so* file under /usr/lib/.*/lib/ + # e.g. /usr/lib/libcairo-directfb/lib/libcairo.so.2.17.5 + # See #483076 + link_file("$src$_", "$dst$crosslib/$1/lib/$2") or goto fail; } elsif (/^(\/usr(\/X11R6)?)?\/lib\/([^\/]+\.so[^\/]*)$/) { # regular .so* file under /lib, /usr/lib or /usr/X11R6/lib if (is_ldscript("$src$_")) { -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
Attachment:
signature.asc
Description: This is a digitally signed message part