Re: Merging feature/android

[Po Lu]

Arash Esbati <arash@gnu.org> writes:

> Po Lu <luangruo@yahoo.com> writes:
>
>> Would someone please test it on Windows as well?
>
> ./autogen.sh and ./configure both work.  Running make says:
>
>   CC       fingerprint.o
>   CC       acl_entries.o
>   CC       asnprintf.o
>   CC       asprintf.o
>   CC       frexp.o
> asprintf.c:30:1: error: redefinition of 'asprintf'
>    30 | asprintf (char **resultp, const char *format, ...)
>       | ^~~~~~~~
> In file included from Z:/pathto/emacs-android/nt/inc/ms-w32.h:389,
>                  from ../src/conf_post.h:38,
>                  from ../src/config.h:3470,
>                  from asprintf.c:18:
> Z:/pathto/msys64/mingw64/include/stdio.h:265:5: note: previous definition of 
> 'asprintf' with type 'int(char **, const char *, ...)'
>   265 | int asprintf(char **__ret, const char *__format, ...)
>       |     ^~~~~~~~
> make[2]: *** [Makefile:102: asprintf.o] Error 1
>
> This is with MSYS2/MinWG64, GCC 12.2.0.  HTH.

Right.  What if you apply this change?

diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index eca3778f203..e107d037153 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -71,7 +71,10 @@ OMIT_GNULIB_MODULE_utimens =
 OMIT_GNULIB_MODULE_fchmodat = true
 OMIT_GNULIB_MODULE_lchmod = true
 OMIT_GNULIB_MODULE_futimens = true
+OMIT_GNULIB_MODULE_float = true
 OMIT_GNULIB_MODULE_utimensat = true
 OMIT_GNULIB_MODULE_file-has-acl = true
 OMIT_GNULIB_MODULE_nproc = true
 OMIT_GNULIB_MODULE_nanosleep = true
+OMIT_GNULIB_MODULE_vfprintf-posix = true
+OMIT_GNULIB_MODULE_vasnprintf = true