mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-20 18:34:35 +00:00
ff080c7f56bump EAPI SRC_URI httpS, website has moved add imagemagick in IUSE (enabled by default) use eautoreconf to modernize building and use the patched configure.in add basic tests with examples files patches : remove declaration for getopt, not needed with glibc and musl (bug 944761) fix imagemagick with new API and detection (bug 886293) bug 886291 fixed because the doc is generated w/ another script now (xhtml) Closes: https://bugs.gentoo.org/886291 Closes: https://bugs.gentoo.org/886293 Closes: https://bugs.gentoo.org/944761 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42959 Closes: https://github.com/gentoo/gentoo/pull/42959 Signed-off-by: Sam James <sam@gentoo.org>
23 lines
882 B
Diff
23 lines
882 B
Diff
# We don't need to declare getopt
|
|
# No conflict with musl or glibc
|
|
diff --git a/compat/getopt.h b/compat/getopt.h
|
|
index b0147e9..62de71c 100644
|
|
--- a/compat/getopt.h
|
|
+++ b/compat/getopt.h
|
|
@@ -127,15 +127,7 @@ struct option
|
|
`getopt'. */
|
|
|
|
#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__ */
|
|
-extern int getopt ();
|
|
-# endif /* __GNU_LIBRARY__ */
|
|
-
|
|
+// getopt already declared in glibc and musl
|
|
# ifndef __need_getopt
|
|
extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
|
|
const struct option *__longopts, int *__longind);
|