picolisp

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/picolisp.git/
Log | Files | Refs | README | LICENSE

commit fbb3308f98ebedab20954e4dcf234325b91457be
parent abeedd01db839626e2142adfc88fdba46e48f4c8
Author: Alexander Burger <abu@software-lab.de>
Date:   Mon,  7 Jan 2013 14:05:36 +0100

FreeBSD port by Mansur Mamkin
Diffstat:
MCREDITS | 2+-
MINSTALL | 3++-
Mersatz/picolisp.jar | 0
Msrc/net.c | 4+++-
Msrc/vers.h | 2+-
Msrc64/Makefile | 59++++++++++++++++++++++++++++++++++++++---------------------
Msrc64/sysdefs.c | 3++-
Msrc64/version.l | 4++--
8 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/CREDITS b/CREDITS @@ -13,7 +13,7 @@ Doug Snead <doug@drugsense.org> # Documentation, CSS styles, Mac OS support, OpenGL library, Norwegian localization Jon Kleiser <jon.kleiser@usit.uio.no> -# Russian localization +# Russian localization, FreeBSD port Mansur Mamkin <mmamkin@mail.ru> # XML parser (and other) improvements diff --git a/INSTALL b/INSTALL @@ -1,4 +1,4 @@ -06nov12abu +07jan13abu (c) Software Lab. Alexander Burger @@ -68,6 +68,7 @@ installation, and invoke them explicitly as desired. - Otherwise, download one of the pre-generated "*.s" file packages - http://software-lab.de/x86-64.linux.tgz + - http://software-lab.de/x86-64.freeBsd.tgz - http://software-lab.de/x86-64.sunOs.tgz - http://software-lab.de/ppc64.linux.tgz diff --git a/ersatz/picolisp.jar b/ersatz/picolisp.jar Binary files differ. diff --git a/src/net.c b/src/net.c @@ -1,4 +1,4 @@ -/* 20oct11abu +/* 07jan13abu * (c) Software Lab. Alexander Burger */ @@ -6,6 +6,8 @@ #include <netdb.h> #include <arpa/inet.h> +#include <netinet/in.h> +#include <sys/socket.h> static void ipErr(any ex, char *s) { err(ex, NULL, "IP %s error: %s", s, strerror(errno)); diff --git a/src/vers.h b/src/vers.h @@ -1 +1 @@ -static byte Version[4] = {3,1,1,5}; +static byte Version[4] = {3,1,1,6}; diff --git a/src64/Makefile b/src64/Makefile @@ -1,4 +1,4 @@ -# 05nov12abu +# 07jan13abu # (c) Software Lab. Alexander Burger .SILENT: @@ -10,19 +10,24 @@ ifeq ($(MAKECMDGOALS), x86-64.linux) UNAME = Linux MACHINE = x86_64 else - ifeq ($(MAKECMDGOALS), x86-64.sunOs) - UNAME = SunOS + ifeq ($(MAKECMDGOALS), x86-64.freeBsd) + UNAME = FreeBSD MACHINE = x86_64 else - ifeq ($(MAKECMDGOALS), ppc64.linux) - UNAME = Linux - MACHINE = ppc64 + ifeq ($(MAKECMDGOALS), x86-64.sunOs) + UNAME = SunOS + MACHINE = x86_64 else - UNAME = $(shell uname) - ifeq ($(MAKECMDGOALS), emu) - MACHINE = emu + ifeq ($(MAKECMDGOALS), ppc64.linux) + UNAME = Linux + MACHINE = ppc64 else - MACHINE = $(shell uname -m) + UNAME = $(shell uname) + ifeq ($(MAKECMDGOALS), emu) + MACHINE = emu + else + MACHINE = $(shell uname -m) + endif endif endif endif @@ -52,21 +57,32 @@ ifeq ($(UNAME), Linux) LD-SHARED = -shared -export-dynamic STRIP = strip else - ifeq ($(UNAME), SunOS) - OS = SunOS - SYS = .sunOs + ifeq ($(UNAME), FreeBSD) + OS = FreeBSD + SYS = .freeBsd FMT = .s ARCH = x86-64 - AS = gas --64 - LD-MAIN = -m64 -lc -lm -ldl -lsocket -lnsl - LD-SHARED = -m64 -shared + AS = as + LD-MAIN = -Wl,--no-as-needed -rdynamic -lc -lm + LD-SHARED = -shared -rdynamic STRIP = strip else - ifeq ($(UNAME), Darwin) - OS = Darwin - LD-MAIN = -lc -lm -ldl - LD-SHARED = -dynamiclib -undefined dynamic_lookup - STRIP = strip -x + ifeq ($(UNAME), SunOS) + OS = SunOS + SYS = .sunOs + FMT = .s + ARCH = x86-64 + AS = gas --64 + LD-MAIN = -m64 -lc -lm -ldl -lsocket -lnsl + LD-SHARED = -m64 -shared + STRIP = strip + else + ifeq ($(UNAME), Darwin) + OS = Darwin + LD-MAIN = -lc -lm -ldl + LD-SHARED = -dynamiclib -undefined dynamic_lookup + STRIP = strip -x + endif endif endif endif @@ -82,6 +98,7 @@ sFiles = \ all: picolisp x86-64.linux: $(sFiles) +x86-64.freeBsd: $(sFiles) x86-64.sunOs: $(sFiles) ppc64.linux: $(sFiles) emu: picolisp diff --git a/src64/sysdefs.c b/src64/sysdefs.c @@ -1,4 +1,4 @@ -/* 16oct12abu +/* 07jan13abu * (c) Software Lab. Alexander Burger */ @@ -23,6 +23,7 @@ #include <sys/resource.h> #include <netdb.h> #include <sys/socket.h> +#include <netinet/in.h> static int SigNums[] = { SIGHUP, SIGINT, SIGUSR1, SIGUSR2, SIGPIPE, SIGALRM, SIGTERM, diff --git a/src64/version.l b/src64/version.l @@ -1,6 +1,6 @@ -# 04jan13abu +# 07jan13abu # (c) Software Lab. Alexander Burger -(de *Version 3 1 1 5) +(de *Version 3 1 1 6) # vi:et:ts=3:sw=3