Re: feature/android 83eeebe9ef2: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

Robert Pluim <rpluim@gmail.com> writes:

>>>>>> On Sun, 18 Jun 2023 20:56:09 -0400 (EDT), Po Lu via Mailing list for 
>>>>>> Emacs changes <emacs-diffs@gnu.org> said:
>
>     Po Lu> branch: feature/android
>     Po Lu> commit 83eeebe9ef21e7278f5da3c233171f60bdf07cee
>     Po Lu> Merge: 273c65f9e90 edb0862f5e6
>     Po Lu> Author: Po Lu <luangruo@yahoo.com>
>     Po Lu> Commit: Po Lu <luangruo@yahoo.com>
>
>     Po Lu>     Merge remote-tracking branch 'origin/master' into 
> feature/android
>
> I doubt itʼs because of this specific change, but this branch doesnʼt
> build on GNU/Linux, presumably because gnulib is now substituting
> vfprintf which it wasnʼt before:
>
> make -C lib-src all
> make[2]: Entering directory '/home/rpluim/repos/emacs-android/lib-src'
>   CCLD     seccomp-filter
> /usr/bin/ld: /tmp/cckKZx81.o: in function `fail':
> /home/rpluim/repos/emacs-android/lib-src/seccomp-filter.c:72: undefined 
> reference to `rpl_vfprintf'
> collect2: error: ld returned 1 exit status
> make[2]: *** [Makefile:483: seccomp-filter] Error 1
> make[2]: Leaving directory '/home/rpluim/repos/emacs-android/lib-src'
> make[1]: *** [Makefile:537: lib-src] Error 2
> make[1]: Leaving directory '/home/rpluim/repos/emacs-android'
>
> Robert

Does this fix the problem?

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 8a1922703de..8a5ce019ca2 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -481,7 +481,7 @@ emacsclient.res:
 ifeq ($(SECCOMP_FILTER),1)
 seccomp-filter$(EXEEXT): $(srcdir)/seccomp-filter.c $(config_h)
        $(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(LIBSECCOMP_CFLAGS) $< \
-         $(LIBSECCOMP_LIBS) -o $@
+         $(LIBSECCOMP_LIBS) $(LOADLIBES) -o $@
 
 seccomp-filter.bpf seccomp-filter.pfc seccomp-filter-exec.bpf 
seccomp-filter-exec.pfc: seccomp-filter$(EXEEXT)
        $(AM_V_GEN)./seccomp-filter$(EXEEXT) \