From 89584de2a54f90984dac2b8602d5cb08673cd7a9 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 15 May 2023 11:25:23 +0800 Subject: [PATCH] Fix the MS-DOS build * msdos/sed1v2.inp: Fix removal of ANDROID_BUILD_CFLAGS. * msdos/sedlibmk.inp: Clear DIR_HAS_FD_MEMBER and LOCALE_FR_UTF8. --- msdos/sed1v2.inp | 2 +- msdos/sedlibmk.inp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 71aa27afce2..1b96cc7ddc4 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -206,7 +206,7 @@ s/ *@WEBP_LIBS@// /^ANDROID_OBJ *=/s/@ANDROID_OBJ@// /^ANDROID_LIBS *=/s/@ANDROID_LIBS@// /^ANDROID_LDFLAGS *=/s/@ANDROID_LDFLAGS@// -/^ANDROID_BUILD_CFLAGS *=/s/@ANDROID_CFLAGS@// +/^ANDROID_BUILD_CFLAGS *=/s/@ANDROID_BUILD_CFLAGS@// /^LIBGMP_CFLAGS *=/s/@LIBGMP_CFLAGS@// /^SQLITE3_CFLAGS *=/s/@SQLITE3_CFLAGS@// /^LIBSELINUX_CFLAGS *=/s/@LIBSELINUX_CFLAGS@// diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index cca2b46b018..09f98f8e0a2 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -200,6 +200,9 @@ s/@PACKAGE@/emacs/ /^GL_GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/ /^GL_GSETTINGS_CFLAGS *=/s/@[^@\n]*@// /^GL_GSETTINGS_LIBS *=/s/@[^@\n]*@// +# Miscellaneous variables. +/^DIR_HAS_FD_MEMBER *=/s/@DIR_HAS_FD_MEMBER@/0/ +/^LOCALE_FR_UTF8 *=/s/@LOCALE_FR_UTF8@/none/ # # Edit the HAVE_foo variables /^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/ -- 2.39.2