commit e3461d1c21a99bcef1b8826f710434e0ffb5adea
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sun Jun 11 15:53:09 2017 -0700

    getopt-posix: port to glibc 2.25.90
    
    Problem reported by Daniel P. Berrange in:
    http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html
    * lib/getopt-pfx-core.h (_GETOPT_CORE_H):
    * lib/getopt-pfx-ext.h (_GETOPT_EXT_H):
    #undef if __GETOPT_PREFIX is defined.

diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h
index 155c11612..6ad0da683 100644
--- a/lib/getopt-pfx-core.h
+++ b/lib/getopt-pfx-core.h
@@ -47,6 +47,11 @@
 # define opterr __GETOPT_ID (opterr)
 # define optind __GETOPT_ID (optind)
 # define optopt __GETOPT_ID (optopt)
+
+/* The system's getopt.h may have already included getopt-core.h to
+   declare the unprefixed identifiers.  Undef _GETOPT_CORE_H so that
+   getopt-core.h declares them with prefixes.  */
+# undef _GETOPT_CORE_H
 #endif
 
 #include <getopt-core.h>
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index d960bb34e..c5ac52202 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -45,6 +45,11 @@
 # define getopt_long_only __GETOPT_ID (getopt_long_only)
 # define option __GETOPT_ID (option)
 # define _getopt_internal __GETOPT_ID (getopt_internal)
+
+/* The system's getopt.h may have already included getopt-ext.h to
+   declare the unprefixed identifiers.  Undef _GETOPT_EXT_H so that
+   getopt-ext.h declares them with prefixes.  */
+# undef _GETOPT_EXT_H
 #endif
 
 /* Standalone applications get correct prototypes for getopt_long and
d='get' action='/guix/log/nix/libstore/build.cc'>
<input type='hidden' name='id' value='a9ee95aec119601332875d9c4becef2331780fee'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a9ee95aec119601332875d9c4becef2331780fee'>root</a>/<a href='/guix/log/nix?id=a9ee95aec119601332875d9c4becef2331780fee'>nix</a>/<a href='/guix/log/nix/libstore?id=a9ee95aec119601332875d9c4becef2331780fee'>libstore</a>/<a href='/guix/log/nix/libstore/build.cc?id=a9ee95aec119601332875d9c4becef2331780fee'>build.cc</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/build.cc?id=a9ee95aec119601332875d9c4becef2331780fee&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-18 01:16:47 +0100'>2022-12-18</span></td><td><a href='/guix/commit/nix/libstore/build.cc?id=2d4d26769d6a3be1b21302b0bb2bd099fd55ccf8'>daemon: Make "opening file" error messages distinguishable.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc (DerivationGoal::openLogFile): Customize
"opening file" error message.
* nix/libutil/hash.cc (hashFile): Likewise.
* nix/libutil/util.cc (readFile, writeFile): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-05 02:00:00 +0200'>2022-06-05</span></td><td><a href='/guix/commit/nix/libstore/build.cc?id=0ace58b99c7292dd962bcd244f274f8033a7fce4'>daemon: Quote consistently within a string.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc (DerivationGoal::registerOutput): ‘’ → `'.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-05-29 02:00:00 +0200'>2022-05-29</span></td><td><a href='/guix/commit/nix/libstore/build.cc?id=82b06436b4b563a85e70f3fcc610959482f08e91'>daemon: Clarify ‘--check’ error when outputs are missing.</a><span class='msg-avail'>...<span class='msg-tooltip'>Drop the confusing ‘invalid’ jargon and display a hint like we do
for ‘--fallback’.

* nix/libstore/build.cc (DerivationGoal::outputsSubstituted): Rewrite error message.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='