From aa24854e7ffa29ad5f1bb49dc794f9fdf5ef44dd Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 14 Mar 2023 15:14:38 +0800 Subject: [PATCH] Fix the MS-DOS build * msdos/sed1v2.inp: * msdos/sed3v2.inp: * msdos/sedlibcf.inp: * msdos/sedlibmk.inp: Update for Android port and new Gnulib modules. --- msdos/sed1v2.inp | 12 ++++++++++++ msdos/sed3v2.inp | 1 + msdos/sedlibcf.inp | 1 + msdos/sedlibmk.inp | 20 ++++++++++++++++++-- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 162ccb3e8d8..32f1a249f21 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -56,6 +56,9 @@ s/ *@LIBPNG@// s/ *@LIBGIF@// s/ *@LIBXPM@// s/ *@WEBP_LIBS@// +/^GIF_CFLAGS *=/s/@GIF_CFLAGS@// +/^JPEG_CFLAGS *=/s/@JPEG_CFLAGS@// +/^TIFF_CFLAGS *=/s/@TIFF_CFLAGS@// /^HAVE_NATIVE_COMP *=/s/@HAVE_NATIVE_COMP@/no/ /^HAVE_PDUMPER *=/s/@HAVE_PDUMPER@/no/ /^HAVE_BE_APP *=/s/@HAVE_BE_APP@/no/ @@ -200,6 +203,14 @@ s/ *@WEBP_LIBS@// /^PAXCTL_dumped *=/s/=.*$/=/ /^PAXCTL_notdumped *=/s/=.*$/=/ /^DUMPING *=/s/@DUMPING@/unexec/ +/^ANDROID_OBJ *=/s/@ANDROID_OBJ@// +/^ANDROID_LIBS *=/s/@ANDROID_LIBS@// +/^ANDROID_LDFLAGS *=/s/@ANDROID_LDFLAGS@// +/^ANDROID_CFLAGS *=/s/@ANDROID_CFLAGS@// +/^LIBGMP_CFLAGS *=/s/@LIBGMP_CFLAGS@// +/^SQLITE3_CFLAGS *=/s/@SQLITE3_CFLAGS@// +/^LIBSELINUX_CFLAGS *=/s/@LIBSELINUX_CFLAGS@// +/^XCONFIGURE *=/s/@XCONFIGURE@// /^[ \t]*MAKE_PDUMPER_FINGERPRINT = *$/c\ MAKE_PDUMPER_FINGERPRINT = /^lisp\.mk:/,/^$/c\ @@ -283,3 +294,4 @@ s| -I\. -I\$(srcdir)| -I.| /^ *test "X/d /\$(CC) -o \$@.tmp/s/\$@.tmp/\$@/ /mv \$@.tmp \$@/d +/^top_builddir =*/s/@top_builddir@/../ diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 9688a27b066..0699fb68b02 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -57,3 +57,4 @@ /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! /^INSTALLABLES/s/emacsclient[^ ]* *// +/^XCONFIGURE *=/s/@XCONFIGURE@// diff --git a/msdos/sedlibcf.inp b/msdos/sedlibcf.inp index 931ceb8f044..8966e799a38 100644 --- a/msdos/sedlibcf.inp +++ b/msdos/sedlibcf.inp @@ -20,3 +20,4 @@ # ---------------------------------------------------------------------- s/c++defs/cxxdefs/g s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g +/^XCONFIGURE *=/s/@XCONFIGURE@// diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index c3f410bd74d..81b2ac44497 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -156,6 +156,7 @@ s/@PACKAGE@/emacs/ /^HYBRID_MALLOC *=/s/@HYBRID_MALLOC@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// +/^ANDROID_CFLAGS *=/s/@ANDROID_CFLAGS@// /^DEFS *=/s/@[^@\n]*@// /^DEPDIR *=/s/@[^@\n]*@/deps/ /^ECHO_N *=/s/@[^@\n]*@/-n/ @@ -299,8 +300,10 @@ s/@PACKAGE@/emacs/ /^NEXT_DIRENT_H *=/s/@[^@\n]*@// /^NEXT_ERRNO_H *=/s/@[^@\n]*@// /^NEXT_FCNTL_H *=/s/@[^@\n]*@// +/^NEXT_FLOAT_H *=/s/@[^@\n]*@// /^NEXT_GETOPT_H *=/s/@[^@\n]*@// /^NEXT_LIMITS_H *=/s/@[^@\n]*@// +/^NEXT_MATH_H *=/s/@[^@\n]*@// /^NEXT_SIGNAL_H *=/s/@[^@\n]*@// /^NEXT_STDDEF_H *=/s/@[^@\n]*@// /^NEXT_STDIO_H *=/s/@[^@\n]*@// @@ -309,9 +312,11 @@ s/@PACKAGE@/emacs/ /^NEXT_STRING_H *=/s/@[^@\n]*@// /^NEXT_SYS_SELECT_H *=/s/@[^@\n]*@// /^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!! +/^NEXT_SYS_RANDOM_H *=/s/@[^@\n]*@// /^NEXT_SYS_TIME_H *=/s/@[^@\n]*@// /^NEXT_SYS_TYPES_H *=/s!@[^@\n]*@!! /^NEXT_TIME_H *=/s/@[^@\n]*@// +/^NEXT_INTTYPES_H *=/s/@[^@\n]*@// /^NEXT_UNISTD_H *=/s/@[^@\n]*@// /^OBJEXT *=/s/@[^@\n]*@/o/ /^PRAGMA_COLUMNS *=/s/@[^@\n]*@// @@ -331,6 +336,7 @@ s/@PACKAGE@/emacs/ /^DIRENT_H *=/s/@[^@\n]*@// /^ERRNO_H *=/s/@[^@\n]*@// /^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ +/^FLOAT_H *=/s/@[^@\n]*@// /^GETOPT_CDEFS_H *=/s/@[^@\n]*@/getopt-cdefs.h/ /^GMP_H *=/s/@[^@\n]*@/gmp.h/ /^LIMITS_H *=/s/@[^@\n]*@/limits.h/ @@ -427,7 +433,7 @@ s/= @GL_GENERATE_STDDEF_H_CONDITION@/= 1/ s/= @GL_GENERATE_STDINT_H_CONDITION@/= 1/ s/= @GL_GENERATE_LIMITS_H_CONDITION@/= 1/ s/= @GL_GENERATE_ERRNO_H_CONDITION@/= / -s/= @GL_GENERATE_LIMITS_H_CONDITION@/= / +s/= @GL_GENERATE_FLOAT_H_CONDITION@/= / s/= @GL_GENERATE_GETOPT_CDEFS_H_CONDITION@/= 1/ s/= @GL_GENERATE_GETOPT_H_CONDITION@/= 1/ s/= @GL_GENERATE_GMP_H_CONDITION@/= 1/ @@ -436,6 +442,8 @@ s/= @GL_GENERATE_MINI_GMP_H_CONDITION@/= 1/ s/= @GL_GENERATE_STDCKDINT_H_CONDITION@/= 1/ s/= @GL_COND_OBJ_STDIO_READ_CONDITION@/= / s/= @GL_COND_OBJ_STDIO_WRITE_CONDITION@/= / +s/= @GL_COND_OBJ_STPNCPY_CONDITION@/= / +s/= @GL_COND_OBJ_.*@/= 1/ s/\$\(MKDIR_P\) malloc// # # Determine which modules to build and which to omit @@ -453,8 +461,11 @@ OMIT_GNULIB_MODULE_euidaccess = true\ OMIT_GNULIB_MODULE_faccessat = true\ OMIT_GNULIB_MODULE_fcntl = true\ OMIT_GNULIB_MODULE_fdopendir = true\ +OMIT_GNULIB_MODULE_float = true\ OMIT_GNULIB_MODULE_fstatat = true\ OMIT_GNULIB_MODULE_fsync = true\ +OMIT_GNULIB_MODULE_getline = true\ +OMIT_GNULIB_MODULE_getdelim = true\ OMIT_GNULIB_MODULE_getdtablesize = true\ OMIT_GNULIB_MODULE_getgroups = true\ OMIT_GNULIB_MODULE_gettimeofday = true\ @@ -462,20 +473,25 @@ OMIT_GNULIB_MODULE_group-member = true\ OMIT_GNULIB_MODULE_inttypes-incomplete = true\ OMIT_GNULIB_MODULE_localtime-buffer = true\ OMIT_GNULIB_MODULE_lstat = true\ +OMIT_GNULIB_MODULE_math = true\ OMIT_GNULIB_MODULE_nanosleep = true\ OMIT_GNULIB_MODULE_open = true\ OMIT_GNULIB_MODULE_pipe2 = true\ +OMIT_GNULIB_MODULE_printf-posix = true\ +OMIT_GNULIB_MODULE_printf-frexpl = true\ OMIT_GNULIB_MODULE_pselect = true\ OMIT_GNULIB_MODULE_putenv = true\ OMIT_GNULIB_MODULE_qcopy-acl = true\ OMIT_GNULIB_MODULE_readlink = true\ OMIT_GNULIB_MODULE_readlinkat = true\ +OMIT_GNULIB_MODULE_stpcpy = true\ OMIT_GNULIB_MODULE_strtoimax = true\ OMIT_GNULIB_MODULE_strtoll = true\ OMIT_GNULIB_MODULE_symlink = true\ OMIT_GNULIB_MODULE_sys_select = true\ OMIT_GNULIB_MODULE_sys_time = true\ -OMIT_GNULIB_MODULE_crypto\/md5 = true +OMIT_GNULIB_MODULE_crypto\/md5 = true\ +OMIT_GNULIB_MODULE_vprintf-posix = true /^arg-nonnull\.h:/,/^[ ][ ]*mv /c\ arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h\ sed -n -e '/GL_ARG_NONNULL/,$$p' < $(top_srcdir)/build-aux/snippet/arg-nonnull.h > $@ -- 2.39.2