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

List:       kde-core-devel
Subject:    Fix for missing RPATH
From:       David Faure <faure () kde ! org>
Date:       2005-01-08 13:55:29
Message-ID: 200501081455.30413.faure () kde ! org
[Download RAW message or body]

KDE_RPATH contains the kde+qt+x directories but not the "prefix of this module".
When I compile kdepim head into its own prefix, readelf shows that RPATH points to 
kdelibs-prefix before kdepim-prefix, every time a binary links to a kdelibs library before
a kdepim library. Of course it can be fixed by fixing the order of the link line in every
Makefile.am ... but a less fragile solution would be to do this at the right place IMHO.

--- acinclude.m4.in     7 Jan 2005 22:56:19 -0000       2.494
+++ acinclude.m4.in     8 Jan 2005 13:46:44 -0000
@@ -3300,7 +3300,11 @@ AC_ARG_ENABLE(rpath,

 if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then

-  KDE_RPATH="-R \$(kde_libraries)"
+  KDE_RPATH="-R \$(libdir)"
+
+  if test "$kde_libraries" != "$libdir"; then
+      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
+  fi

   if test -n "$qt_libraries"; then
     KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"

-- 
David Faure, faure@kde.org, sponsored by Trolltech to work on KDE,
Konqueror (http://www.konqueror.org), and KOffice (http://www.koffice.org).
[prev in list] [next in list] [prev in thread] [next in thread]