annotate src/default-octave-1-gnulib.patch @ 6213:5f64fb928091 release

build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents fbb5ba9cfd8a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4160
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/libgnu/unistd.in.h b/libgnu/unistd.in.h
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/libgnu/unistd.in.h 2016-06-18 18:47:32.000000000 -0400
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/libgnu/unistd.in.h 2016-06-23 18:45:42.410781867 -0400
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -734,7 +734,7 @@
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 Null terminate it if the name is shorter than LEN.
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 If the host name is longer than LEN, set errno = EINVAL and return -1.
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Return 0 if successful, otherwise set errno and return -1. */
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -# if @UNISTD_H_HAVE_WINSOCK2_H@
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 # undef gethostname
295580aa01b6 temporary patch for gnulib in default-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 # define gethostname rpl_gethostname