Re: Android port

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]

On 2023-08-06 05:20, Po Lu wrote:
> That being said, I'm reluctant to remove the printf-posix module at this
> stage of the port's development.  Emacs has undergone extensive testing
> on all supported versions of Android with the Gnulib printf, and hardly
> any at all without.

I understand the reluctance from the Android point of view. However, 
printf-posix imports 69 new source files to Emacs, and these files have 
not been tested extensively with Emacs on non-Android platforms. From 
the viewpoint of non-Android Emacs platforms, it's significantly less 
disruptive if merging the Android branch does not add 69 new source 
files that will require testing on these platforms.

And even from the Android viewpoint, no matter what we do to fix the 
problem some testing needs to be done anyway, as the fix is likely to 
affect Emacs in test-relevant ways.

So I propose that we merge the master branch into feature/android (to 
get the recent fix to stop using %n) and then apply the attached 
patches. The first and third patches are the actual idea. The second 
patch (compressed to save space) is automatically generated via 
admin/merge-gnulib, and consists of deleting the 69 source files.

The idea is to get feature/android merged quickly. We can revisit the 
use of Gnulib's printf-posix module later, as needed. With luck 
printf-posix won't be needed, as Emacs historically has avoided use of 
unusual printf features (for obvious portability reasons).

[-- Attachment #2: 0001-Omit-Gnulib-printf-posix-and-vasnprintf-posix.patch --]
[-- Type: text/x-patch, Size: 1159 bytes --]

From 93d3a009f7d6b5b35790c2ac5e68e66999a6e030 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Aug 2023 09:40:33 -0700
Subject: [PATCH 1/3] Omit Gnulib printf-posix and vasnprintf-posix

These Gnulib modules were needed only for the %n format,
and Emacs no longer uses that format.  Also, they were causing
trouble with Emacs's specialized Gnulib importation procedure.
* admin/merge-gnulib (GNULIB_MODULES): Omit printf-posix,
vasnprintf-posix.
---
 admin/merge-gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index a0dbaae1519..b533f69cceb 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -42,7 +42,7 @@ GNULIB_MODULES=
   manywarnings memmem-simple mempcpy memrchr memset_explicit
   minmax mkostemp mktime
   nanosleep nproc nstrftime
-  pathmax pipe2 printf-posix vasprintf-posix pselect pthread_sigmask
+  pathmax pipe2 pselect pthread_sigmask
   qcopy-acl readlink readlinkat regex
   sig2str sigdescr_np socklen stat-time std-gnu11 stdbool stdckdint stddef stdio
   stpcpy stpncpy strnlen strnlen strtoimax symlink sys_stat sys_time
-- 
2.39.2


[-- Attachment #3: 0002-Regenerate-by-running-admin-merge-gnulib.patch.gz --]
[-- Type: application/gzip, Size: 118024 bytes --]

[-- Attachment #4: 0003-Do-not-define-HAVE_CONFIG_H.patch --]
[-- Type: text/x-patch, Size: 860 bytes --]

From 635234839394ca071a4fbb985233cf1bf1c9735f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Aug 2023 10:32:54 -0700
Subject: [PATCH 3/3] Do not define HAVE_CONFIG_H

* configure.ac (CFLAGS): No need for -DHAVE_CONFIG_H
since Emacs no longer uses Gnulib's printf modules.
---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c77fab3eefd..493582d42c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7019,9 +7019,6 @@ AC_DEFUN
   [Short copyright string for this version of Emacs.])
 AC_SUBST([copyright])
 
-# This is needed for gnulib's printf modules.
-CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
-
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.
 AC_SUBST([version])
-- 
2.39.2