From: Bruno Haible Date: Sat, 19 Nov 2016 13:03:07 +0000 (+0100) Subject: relocatable-prog-wrapper: Fix breakage on Cygwin. X-Git-Tag: v1.0~6549 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d91ad340b45ff869aa60eb6eea0cb504ba671ecb;p=gnulib.git relocatable-prog-wrapper: Fix breakage on Cygwin. * modules/relocatable-prog-wrapper (Files): Add lib/stat.c, lib/lstat.c. (Depends-on): Remove intprops. * lib/relocwrapper.c: Update dependency tree. (strerror): Undefine. * build-aux/install-reloc (func_create_wrapper): Do not compile strerror.c and strerror-override.c. Erase stat.o and lstat.o. --- diff --git a/ChangeLog b/ChangeLog index c7bf5abc0d..9582eb5381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2016-11-19 Bruno Haible + + relocatable-prog-wrapper: Fix breakage on Cygwin. + * modules/relocatable-prog-wrapper (Files): Add lib/stat.c, lib/lstat.c. + (Depends-on): Remove intprops. + * lib/relocwrapper.c: Update dependency tree. + (strerror): Undefine. + * build-aux/install-reloc (func_create_wrapper): Do not compile + strerror.c and strerror-override.c. Erase stat.o and lstat.o. + 2016-11-19 Bruno Haible strerror: Make it compile in C++ mode. diff --git a/build-aux/install-reloc b/build-aux/install-reloc index 979a056db6..1a2b5a410f 100755 --- a/build-aux/install-reloc +++ b/build-aux/install-reloc @@ -232,15 +232,13 @@ func_create_wrapper () "$srcdir"/areadlink.c \ "$srcdir"/careadlinkat.c \ "$srcdir"/allocator.c \ - "$srcdir"/strerror-override.c \ - "$srcdir"/stat.c \ - "$srcdir"/lstat.c \ "$srcdir"/readlink.c \ + "$srcdir"/stat.c \ "$srcdir"/canonicalize-lgpl.c \ "$srcdir"/malloca.c \ + "$srcdir"/lstat.c \ "$srcdir"/relocatable.c \ "$srcdir"/setenv.c \ - "$srcdir"/strerror.c \ "$srcdir"/c-ctype.c \ -o "$destprog.wrapper$exeext" rc=$? @@ -253,11 +251,12 @@ func_create_wrapper () careadlinkat.o \ allocator.o \ readlink.o \ + stat.o \ canonicalize-lgpl.o \ malloca.o \ + lstat.o \ relocatable.o \ setenv.o \ - strerror.o \ c-ctype.o test $rc = 0 || exit $? # Clean up debugging information left over by the native C compiler on MacOS X. diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c index 5eefa2be95..69a6e982a7 100644 --- a/lib/relocwrapper.c +++ b/lib/relocwrapper.c @@ -19,16 +19,23 @@ relocwrapper -> progname -> progreloc - -> areadlink - -> careadlinkat + -> areadlink + -> careadlinkat -> allocator - -> readlink - -> canonicalize-lgpl - -> malloca - -> readlink + -> readlink + -> stat + -> dosname + -> pathmax + -> verify + -> canonicalize-lgpl + -> malloca + -> lstat + -> readlink -> relocatable -> setenv -> malloca + -> fprintf-posix [ignore, cut dependency tree here] + -> strerror [ignore, cut dependency tree here] -> c-ctype Macros that need to be set while compiling this file: @@ -60,6 +67,7 @@ /* Use the system functions, not the gnulib overrides in this file. */ #undef fprintf +#undef strerror /* Return a copy of the filename, with an extra ".bin" at the end. More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}". */ diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index a75b426098..50444b1a77 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -15,9 +15,11 @@ lib/careadlinkat.c lib/allocator.h lib/allocator.c lib/readlink.c +lib/stat.c lib/canonicalize-lgpl.c lib/malloca.h lib/malloca.c +lib/lstat.c lib/relocatable.h lib/relocatable.c lib/setenv.c @@ -43,7 +45,6 @@ stdint stdlib unistd environ -intprops string verify