From kde-core-devel  Mon Apr 25 14:57:09 2005
From: Ben Burton <bab () debian ! org>
Date: Mon, 25 Apr 2005 14:57:09 +0000
To: kde-core-devel
Subject: amd64/ppc64 patch for admin/libtool.m4.in
Message-Id: <20050425145709.GD9821 () eclipse ! debian ! net>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=111444106809650


Hi,

The debian amd64 people have offered the following patch for
admin/libtool.m4.in.  The situation is that, on debian amd64 systems,
/lib64 is a symlink to /lib and so the "64" suffix should not be used.

The patch below simply adds a test for whether /lib64 is a symlink.  For
other distributions where /lib64 is a real directory, nothing should
change.

Would you be happy to include this patch in admin/ ?  The patch is
against KDE_3_3_BRANCH, but both KDE_3_4_BRANCH and HEAD have the same
issue.

I'm CCing Andreas Jochens who supplied the patch (since I don't actually
have a 64-bit system at all, and I can't offer much insight into amd64
issues).  Please CC him with any replies.

Andreas: Please note that this single admin/ directory gets propagated
to all KDE modules, so this should address several of the bug reports
that you've filed.

Thanks - Ben.

--- ../tmp-orig/kdeaddons-3.3.2/admin/libtool.m4.in
+++ ./admin/libtool.m4.in
@@ -1424,7 +1424,7 @@
   libsuff=
   if test "x$LINUX_64_MODE" = x64; then
     # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
+    if test -d /lib64 && ! test -L /lib64; then
       libsuff=64
     fi
   fi