suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cs: more OpenIndiana repairs

Browse Source
This commit is contained in:
Matthew Flatt 2020-10-12 08:46:50 -06:00
parent 171608a1a2
commit 3566536cfe
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.makefile
View File

@ -338,7 +338,7 @@ RACKET_FOR_BOOTFILES = $(RACKET)
RACKET_FOR_BUILD = $(RACKET)
# This branch name changes each time the pb boot files are updated:
PB_BRANCH == circa-7.9.0.2-1
PB_BRANCH == circa-7.9.0.2-2
PB_REPO = https://github.com/racket/pb
# Alternative source for Chez Scheme boot files, normally set by

12
Makefile
View File

@ -47,7 +47,7 @@ RACKETCS_SUFFIX =
RACKET =
RACKET_FOR_BOOTFILES = $(RACKET)
RACKET_FOR_BUILD = $(RACKET)
PB_BRANCH = circa-7.9.0.2-1
PB_BRANCH = circa-7.9.0.2-2
PB_REPO = https://github.com/racket/pb
EXTRA_REPOS_BASE =
CS_CROSS_SUFFIX =
@ -306,14 +306,14 @@ maybe-fetch-pb-as-is:
echo done
fetch-pb-from:
mkdir -p racket/src/ChezScheme/boot
if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q -b circa-7.9.0.2-1 $(PB_REPO) racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-7.9.0.2-1:remotes/origin/circa-7.9.0.2-1 ; fi
cd racket/src/ChezScheme/boot/pb && git checkout -q circa-7.9.0.2-1
if [ ! -d racket/src/ChezScheme/boot/pb ] ; then git clone -q -b circa-7.9.0.2-2 $(PB_REPO) racket/src/ChezScheme/boot/pb ; else cd racket/src/ChezScheme/boot/pb && git fetch -q origin circa-7.9.0.2-2:remotes/origin/circa-7.9.0.2-2 ; fi
cd racket/src/ChezScheme/boot/pb && git checkout -q circa-7.9.0.2-2
pb-stage:
cd racket/src/ChezScheme/boot/pb && git branch circa-7.9.0.2-1
cd racket/src/ChezScheme/boot/pb && git checkout circa-7.9.0.2-1
cd racket/src/ChezScheme/boot/pb && git branch circa-7.9.0.2-2
cd racket/src/ChezScheme/boot/pb && git checkout circa-7.9.0.2-2
cd racket/src/ChezScheme/boot/pb && git add . && git commit --amend -m "new build"
pb-push:
cd racket/src/ChezScheme/boot/pb && git push -u origin circa-7.9.0.2-1
cd racket/src/ChezScheme/boot/pb && git push -u origin circa-7.9.0.2-2
win-cs-base:
IF "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-bc-then-cs-base SETUP_BOOT_MODE=--boot WIN32_BUILD_LEVEL=bc PLAIN_RACKET=racket\racketbc DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETBC_SUFFIX="$(RACKETBC_SUFFIX)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)"
IF not "$(RACKET_FOR_BUILD)" == "" $(MAKE) win-just-cs-base SETUP_BOOT_MODE=--chain DISABLE_STATIC_LIBS="$(DISABLE_STATIC_LIBS)" EXTRA_REPOS_BASE="$(EXTRA_REPOS_BASE)" JOB_OPTIONS="$(JOB_OPTIONS)" PLT_SETUP_OPTIONS="$(PLT_SETUP_OPTIONS)" RACKETCS_SUFFIX="$(RACKETCS_SUFFIX)" RACKET_FOR_BUILD="$(RACKET_FOR_BUILD)"

2
racket/src/ChezScheme/c/prim5.c
View File

@ -53,7 +53,9 @@ static void s_showalloc PROTO((IBOOL show_dump, const char *outfn));
static ptr s_system PROTO((const char *s));
static ptr s_process PROTO((char *s, IBOOL stderrp));
static I32 s_chdir PROTO((const char *inpath));
#ifdef GETWD
static char *s_getwd PROTO((void));
#endif
static ptr s_set_code_byte PROTO((ptr p, ptr n, ptr x));
static ptr s_set_code_word PROTO((ptr p, ptr n, ptr x));
static ptr s_set_code_long PROTO((ptr p, ptr n, ptr x));

8
racket/src/ChezScheme/c/stats.c
View File

@ -20,7 +20,9 @@
#define _REENTRANT
#endif
/* make two-argument ctime_r and two-argument asctime_r visible */
#define _POSIX_PTHREAD_SEMANTICS
# ifndef _POSIX_PTHREAD_SEMANTICS
# define _POSIX_PTHREAD_SEMANTICS
# endif
#endif /* defined(SOLARIS) */
#include "system.h"
@ -510,7 +512,11 @@ static long adjust_time_zone(ptr dtvec, struct tm *tmxp, ptr given_tzoff) {
}
}
#else
# ifdef defined(SOLARIS)
tzoff = timezone;
# else
tzoff = tmxp->tm_gmtoff;
# endif
if (given_tzoff == Sfalse) {
# if defined(__linux__) || defined(SOLARIS)
/* Linux and Solaris set `tzname`: */

4
racket/src/ChezScheme/s/mkheader.ss
View File

@ -190,7 +190,9 @@
(constant-case architecture
[(pb)
(nl)
(pr "#define _LARGEFILE64_SOURCE\n") ; needed on some 32-bit platforms before <stdint.h>
(pr "#ifndef _LARGEFILE64_SOURCE\n")
(pr "# define _LARGEFILE64_SOURCE\n") ; needed on some 32-bit platforms before <stdint.h>
(pr "#endif\n")
(pr "#include <stdint.h>\n")]
[else (void)])

2
racket/src/cs/c/configure vendored
View File

@ -4228,8 +4228,10 @@ disable_curses_arg=--disable-curses
case "$host_os" in
solaris2*)
MACH_OS=s2
LIBS="$LIBS -lsocket -lnsl -lintl"
use_flag_pthread="no"
use_flag_posix_pthread="yes"
enable_strip=no
;;
aix*)
;;

2
racket/src/cs/c/configure.ac
View File

@ -189,8 +189,10 @@ disable_curses_arg=--disable-curses
case "$host_os" in
solaris2*)
MACH_OS=s2
LIBS="$LIBS -lsocket -lnsl -lintl"
use_flag_pthread="no"
use_flag_posix_pthread="yes"
enable_strip=no
;;
aix*)
;;