3
0
Fork 0
forked from mirrors/nixpkgs

gvpe: fix build with glibc 2.26

Tracking issue: #31696
This commit is contained in:
Orivej Desh 2017-11-15 21:33:53 +00:00
parent df0300cf67
commit f55308e749
2 changed files with 20 additions and 0 deletions

View file

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf";
};
patches = [ ./gvpe-3.0-glibc-2.26.patch ];
buildInputs = [ openssl gmp zlib ];
configureFlags = [

View file

@ -0,0 +1,18 @@
diff --git a/lib/getopt.h b/lib/getopt.h
index 2d02142..5e7d8d4 100644
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -101,13 +101,6 @@ struct option
#define optional_argument 2
#if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
- errors, only prototype getopt for the GNU C library. */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv,