diff options
author | Eli Zaretskii <[email protected]> | 2012-06-30 18:32:51 +0300 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2012-06-30 18:32:51 +0300 |
commit | 0d23c240ea378d9a29042266216f4cf25151a04d (patch) | |
tree | dc3d25374540cc607085f405c4692d976ec14834 /msdos | |
parent | 3cfbebba71090f6ea0c2ca4a6056a3e645cee2e8 (diff) |
Adapt the MS-DOS build to the latest changes.
msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not
bootstrap-clean (which doesn't exist).
msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu".
msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command.
msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty.
Remove lines that invoke PAXCTL.
(clean): Fix recipe not to run Unixy shell commands.
msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'.
(HAVE_STRNCASECMP): Edit to 1.
msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty.
(C_SWITCH_SYSTEM): Add "-I../msdos".
msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT)
(GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H)
(HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H)
(NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H)
(NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT)
(REPLACE_STRUCT_TIMEVAL): Edit to appropriate values.
(BUILT_SOURCES): Edit out sys/select.h and sys/time.h.
(mostlyclean-local, distclean-generic): Fix recipe not to run
Unixy shell commands.
src/sysselect.h [DOS_NT]: Don't include sys/select.h.
src/s/ms-w32.h (select, pselect): Don't define here, they are
defined in sysselect.h
src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
src/sysdep.c: Don't include dos.h and dosfns.h.
src/process.c (sys_select):
src/msdos.c (sys_select): Accept one more argument and ignore it.
src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
adapt data types and code to that.
src/dosfns.c:
src/msdos.c (gettime, settime): Define away the prototypes in dos.h,
which clashes with the gnulib function of the same name.
lisp/emacs-lisp/timer.el (timer-until): Subtract results of
float-time, instead of taking float-time of the result of
time-subtract, since float-time signals an error for negative time
arguments.
Diffstat (limited to 'msdos')
-rw-r--r-- | msdos/ChangeLog | 29 | ||||
-rw-r--r-- | msdos/inttypes.h | 1 | ||||
-rw-r--r-- | msdos/mainmake.v2 | 2 | ||||
-rw-r--r-- | msdos/sed1v2.inp | 4 | ||||
-rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
-rw-r--r-- | msdos/sed3v2.inp | 3 | ||||
-rw-r--r-- | msdos/sedleim.inp | 2 | ||||
-rw-r--r-- | msdos/sedlibmk.inp | 20 |
8 files changed, 61 insertions, 2 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 1e156563e0..f0c3703f36 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,32 @@ +2012-06-30 Eli Zaretskii <[email protected]> + + * mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not + bootstrap-clean (which doesn't exist). + + * inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu". + + * sedleim.inp (MKDIR_P): Edit to DOS "md" command. + + * sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty. + Remove lines that invoke PAXCTL. + (clean): Fix recipe not to run Unixy shell commands. + + * sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'. + (HAVE_STRNCASECMP): Edit to 1. + + * sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty. + (C_SWITCH_SYSTEM): Add "-I../msdos". + + * sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT) + (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H) + (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H) + (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H) + (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT) + (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values. + (BUILT_SOURCES): Edit out sys/select.h and sys/time.h. + (mostlyclean-local, distclean-generic): Fix recipe not to run + Unixy shell commands. + 2012-06-26 Paul Eggert <[email protected]> Clean out last vestiges of the old HAVE_CONFIG_H stuff. diff --git a/msdos/inttypes.h b/msdos/inttypes.h index 6128cbf315..dba56f8376 100644 --- a/msdos/inttypes.h +++ b/msdos/inttypes.h @@ -31,6 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <stdlib.h> #define strtoumax strtoull #define strtoimax strtoll +#define PRIuMAX "llu" #endif /* __DJGPP__ < 2.04 */ #endif diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index b4837b99fb..e1e646a855 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -269,7 +269,7 @@ extraclean: bootstrap-clean: FRC cd lib - $(MAKE) $(MFLAGS) $@ + -$(MAKE) $(MFLAGS) maintainer-clean cd .. cd src $(MAKE) $(MFLAGS) $@ diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index b9e94afea5..b2ce4b327d 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -105,6 +105,7 @@ s/\.h\.in/.h-in/ /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// +/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// @@ -137,6 +138,8 @@ s/\.h\.in/.h-in/ /^[ ]*$/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit +/^ *test "X\$(PAXCTL)" = X/d +/^ *test "\$(CANNOT_DUMP)" = "yes"/d /^ if test "\$(CANNOT_DUMP)" =/,/^ else /d /^ fi/d /^ *LC_ALL=C \$(RUN_TEMACS)/i\ @@ -198,3 +201,4 @@ s/ \$(DBUS_CFLAGS)// s| -I\$(srcdir)/../lib|| # Add our local inttypes.h to prerequisites where needed /^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| +/^ *test "X/d diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 85ab02c877..853c64fb17 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -45,10 +45,12 @@ /^#undef HAVE_MEMMOVE *$/s/^.*$/#define HAVE_MEMMOVE 1/ /^#undef HAVE_SETRLIMIT *$/s/^.*$/#define HAVE_SETRLIMIT 1/ /^#undef HAVE_GETRUSAGE *$/s/^.*$/#define HAVE_GETRUSAGE 1/ +/^#undef GETTIMEOFDAY_TIMEZONE *$/s/^.*$/#define GETTIMEOFDAY_TIMEZONE struct timezone/ /^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/ /^#undef HAVE_STRUCT_TIMEZONE *$/s/^.*$/#define HAVE_STRUCT_TIMEZONE 1/ /^#undef HAVE_SIZE_T *$/s/^.*$/#define HAVE_SIZE_T 1/ /^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/ +/^#undef HAVE_STRNCASECMP *$/s/^.*$/#define HAVE_STRNCASECMP 1/ /^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/ /^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/ /^#undef HAVE___BUILTIN_UNWIND_INIT *$/s/^.*$/#define HAVE___BUILTIN_UNWIND_INIT 1/ diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index faa57996a2..bfa008b3e8 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -35,8 +35,9 @@ s/-DVERSION[^ ]* // /^LIBRESOLV *=/s/@[^@\n]*@//g /^LIBS_MAIL *=/s/@[^@\n]*@//g /^LIBS_SYSTEM *=/s/@[^@\n]*@//g +/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! -/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! +/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index 41f87d9204..461a2b7a9e 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -35,6 +35,8 @@ s|\([ ]\)echo|\1djecho|g export EMACSLOADPATH=${buildlisppath}\ RUN_EMACS = ${EMACS} -batch --no-site-file +/^MKDIR_P *=/s,@MKDIR_P@,command.com /c md, + /^ cd ../c\ ${MAKE} -C ../src ${MFLAGS} emacs diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 31335e1e8c..40b94acf10 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -211,6 +211,7 @@ am__cd = cd /^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/ /^GNULIB_GL_UNISTD_H_GETOPT *=/s/@GNULIB_GL_UNISTD_H_GETOPT@/1/ /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ +/^GNULIB_GETTIMEOFDAY *=/s/@GNULIB_GETTIMEOFDAY@/0/ /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ /^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/ @@ -246,6 +247,7 @@ am__cd = cd /^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/ /^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/ /^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/ +/^GNULIB_PSELECT *=/s/@GNULIB_PSELECT@/0/ /^GNULIB_PTHREAD_SIGMASK *=/s/@GNULIB_PTHREAD_SIGMASK@/0/ /^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/ /^GNULIB_PTSNAME_R *=/s/@GNULIB_PTSNAME_R@/0/ @@ -268,6 +270,7 @@ am__cd = cd /^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/ /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/ /^GNULIB_SCANF *=/s/@GNULIB_SCANF@/0/ +/^GNULIB_SELECT *=/s/@GNULIB_SELECT@/0/ /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/ /^GNULIB_SETHOSTNAME *=/s/@GNULIB_SETHOSTNAME@/0/ /^GNULIB_SIGACTION *=/s/@GNULIB_SIGACTION@/0/ @@ -418,12 +421,15 @@ am__cd = cd /^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/ /^HAVE_STRUCT_SIGACTION_SA_SIGACTION *=/s/@HAVE_STRUCT_SIGACTION_SA_SIGACTION@/0/ /^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/ +/^HAVE_STRUCT_TIMEVAL *=/s/@HAVE_STRUCT_TIMEVAL@/1/ /^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/ /^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/ /^HAVE_SYS_BITYPES_H *=/s/@HAVE_SYS_BITYPES_H@/0/ /^HAVE_SYS_INTTYPES_H *=/s/@HAVE_SYS_INTTYPES_H@/0/ /^HAVE_SYS_LOADAVG_H *=/s/@HAVE_SYS_LOADAVG_H@/0/ /^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/ +/^HAVE_SYS_SELECT_H *=/s/@HAVE_SYS_SELECT_H@/0/ +/^HAVE_SYS_TIME_H *=/s/@HAVE_SYS_TIME_H@/1/ /^HAVE_SYS_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/ /^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/ /^HAVE_TYPE_VOLATILE_SIG_ATOMIC_T *=/s/@HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@/1/ @@ -457,7 +463,9 @@ am__cd = cd /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/ /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/ /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/ +/^NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>! +/^NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H *=/s!@[^@\n]*@!<sys/types.h>! /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@/<time.h>/ /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/ @@ -468,7 +476,9 @@ am__cd = cd /^NEXT_STDIO_H *=/s/@[^@\n]*@/<stdio.h>/ /^NEXT_STDINT_H *=/s/@[^@\n]*@/<stdint.h>/ /^NEXT_STDLIB_H *=/s/@[^@\n]*@/<stdlib.h>/ +/^NEXT_SYS_SELECT_H *=/s/@[^@\n]*@// /^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!<sys/stat.h>! +/^NEXT_SYS_TIME_H *=/s/@[^@\n]*@// /^NEXT_SYS_TYPES_H *=/s!@[^@\n]*@!<sys/types.h>! /^NEXT_TIME_H *=/s/@[^@\n]*@/<time.h>/ /^NEXT_UNISTD_H *=/s/@[^@\n]*@/<unistd.h>/ @@ -507,6 +517,7 @@ am__cd = cd /^REPLACE_GETLINE *=/s/@REPLACE_GETLINE@/0/ /^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/ /^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/ +/^REPLACE_GETTIMEOFDAY *=/s/@REPLACE_GETTIMEOFDAY@/0/ /^REPLACE_ISATTY *=/s/@REPLACE_ISATTY@/0/ /^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/ /^REPLACE_LINK *=/s/@REPLACE_LINK@/0/ @@ -529,6 +540,7 @@ am__cd = cd /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/ /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ /^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/ +/^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/ /^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/ /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ @@ -551,6 +563,7 @@ am__cd = cd /^REPLACE_STDIO_WRITE_FUNCS *=/s/@REPLACE_STDIO_WRITE_FUNCS@/0/ /^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/ /^REPLACE_STRTOIMAX *=/s/@REPLACE_STRTOIMAX@/0/ +/^REPLACE_STRUCT_TIMEVAL *=/s/@REPLACE_STRUCT_TIMEVAL@/0/ /^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/ /^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/ /^REPLACE_TMPFILE *=/s/@REPLACE_TMPFILE@/0/ @@ -588,6 +601,10 @@ am__cd = cd /am__append_2 *=.*verify\.h/s/@[^@\n]*@// /^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o pthread_sigmask.o/ /^BUILT_SOURCES *=/s/ *inttypes\.h// +/^BUILT_SOURCES *=/,/^[^ ]/{ + s| *sys/select\.h|| + s| *sys/time\.h|| +} /^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// /^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)// /^srcdir *=/s/@[^@\n]*@/./ @@ -661,3 +678,6 @@ s/\.in-h\; *\\$/.in-h >> $@-t/ s/'\; \\ *$/' >> $@-t/ } s!\$(MKDIR_P)[ ][ ]*sys!command.com /c "if not exist sys\\stat.h md sys"! +/^ @for dir in/,/^[^ ]/c\ + -rm -rf $(MOSTLYCLEANDIRS) +/^ *-test . /d |