diff options
| author | Paul Eggert | 2012-09-27 16:02:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-27 16:02:23 -0700 |
| commit | 89d17fd0f291f4ea6d14fe1bc0143554dba6e951 (patch) | |
| tree | 4118229c4ff6b645e857e9013af6dd6b674c8142 /msdos | |
| parent | e28e67b3a36f1534e2659fbfde90846a9fd5df6c (diff) | |
| download | emacs-89d17fd0f291f4ea6d14fe1bc0143554dba6e951.tar.gz emacs-89d17fd0f291f4ea6d14fe1bc0143554dba6e951.zip | |
Link with LIB_TIMER_TIME as needed.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 45666a335de..525868b2c70 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-27 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Check more robustly for timer_settime. | ||
| 4 | * sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro. | ||
| 5 | |||
| 1 | 2012-08-04 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-08-04 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix | 8 | * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 0ed88931691..fbee1dd03f9 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -106,6 +106,7 @@ s/\.h\.in/.h-in/ | |||
| 106 | /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// | 106 | /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// |
| 107 | /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// | 107 | /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// |
| 108 | /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g | 108 | /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g |
| 109 | /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g | ||
| 109 | /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// | 110 | /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// |
| 110 | /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// | 111 | /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// |
| 111 | /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// | 112 | /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// |
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index bfa008b3e81..cd58e47305c 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp | |||
| @@ -36,6 +36,7 @@ s/-DVERSION[^ ]* // | |||
| 36 | /^LIBS_MAIL *=/s/@[^@\n]*@//g | 36 | /^LIBS_MAIL *=/s/@[^@\n]*@//g |
| 37 | /^LIBS_SYSTEM *=/s/@[^@\n]*@//g | 37 | /^LIBS_SYSTEM *=/s/@[^@\n]*@//g |
| 38 | /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g | 38 | /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g |
| 39 | /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g | ||
| 39 | /^CFLAGS *=/s!=.*$!=-O2 -g! | 40 | /^CFLAGS *=/s!=.*$!=-O2 -g! |
| 40 | /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! | 41 | /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! |
| 41 | /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// | 42 | /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// |