Re: relocwrapper interaction with replacement functions

[Bruno Haible]

Ben Pfaff wrote in 
<http://lists.gnu.org/archive/html/bug-gnulib/2010-06/msg00087.html>:
> >   [4/4] getcwd, relocwrapper link errors
> 
> I didn't see this posted yet, but I guess it is not important on
> OpenBSD 4.7.

It's heavy to use the getcwd replacement in relocwrapper, and probably rarely
needed (because who installs programs in locations that require file names
longer than 1000 bytes?). So I'm now removing the link error by using getcwd
instead of rpl_getcwd.


2010-08-28  Bruno Haible  <address@hidden>

        Avoid relocwrapper link errors due to gnulib replacement functions.
        * lib/canonicalize-lgpl.c [IN_RELOCWRAPPER]: Use the system's getcwd
        function.
        Reported by Ben Pfaff <address@hidden>.

--- lib/canonicalize-lgpl.c.orig        Sat Aug 28 11:10:48 2010
+++ lib/canonicalize-lgpl.c     Sat Aug 28 11:10:11 2010
@@ -51,6 +51,12 @@
 # include "pathmax.h"
 # include "malloca.h"
 # if HAVE_GETCWD
+#  if IN_RELOCWRAPPER
+    /* When building the relocatable program wrapper, use the system's getcwd
+       function, not the gnulib override, otherwise we would get a link error.
+     */
+#   undef getcwd
+#  endif
 #  ifdef VMS
     /* We want the directory in Unix syntax, not in VMS syntax.  */
 #   define __getcwd(buf, max) getcwd (buf, max, 0)