pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/scm Always link scmlit with LIBS=-lm, since it us...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dd5f003e7f7d
branches: trunk
changeset: 508462:dd5f003e7f7d
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Feb 19 17:50:11 2006 +0000
description:
Always link scmlit with LIBS=-lm, since it uses math functions.
Fix errno. Add DragonFly support.
diffstat:
lang/scm/distinfo | 10 ++++-
lang/scm/patches/patch-aa | 11 +++++-
lang/scm/patches/patch-ac | 25 +++++++++++++
lang/scm/patches/patch-ad | 13 ++++++
lang/scm/patches/patch-ae | 13 ++++++
lang/scm/patches/patch-af | 40 ++++++++++++++++++++
lang/scm/patches/patch-ag | 90 +++++++++++++++++++++++++++++++++++++++++++++++
lang/scm/patches/patch-ah | 14 +++++++
8 files changed, 213 insertions(+), 3 deletions(-)
diffs (259 lines):
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/distinfo
--- a/lang/scm/distinfo Sun Feb 19 17:24:37 2006 +0000
+++ b/lang/scm/distinfo Sun Feb 19 17:50:11 2006 +0000
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.4 2005/10/25 09:32:15 adam Exp $
+$NetBSD: distinfo,v 1.5 2006/02/19 17:50:11 joerg Exp $
SHA1 (scm5e1.zip) = 20bb517f1b6229644a1f3873d7607cac3569a5fa
RMD160 (scm5e1.zip) = 2f4c2d05061db2f0929053b0c565631c7a4806e2
Size (scm5e1.zip) = 868500 bytes
-SHA1 (patch-aa) = a95838a777b6b769ed18635705e081cad40c3971
+SHA1 (patch-aa) = be890f81fdd284cfd04c39841a06117ac63d3c04
SHA1 (patch-ab) = d6c19134cb99d6f4d847ff53c2d73f7ba847becd
+SHA1 (patch-ac) = 248981dd6fe1e099dc747d2dfca14671e60a9897
+SHA1 (patch-ad) = 8f5a993d4adcb053884985f966ceb2092999ff70
+SHA1 (patch-ae) = dc6691615dced4295ce1fa21dff5c1b955de858b
+SHA1 (patch-af) = 8b8d61bf9a20ae3185c2b63ed4f56649ee80d7dc
+SHA1 (patch-ag) = 2e5b570e7664d2193bfd7e8e25c7e565a7aaf793
+SHA1 (patch-ah) = 63f883c3eeedb35f1879fc7d5cda40f43af3d4f7
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-aa
--- a/lang/scm/patches/patch-aa Sun Feb 19 17:24:37 2006 +0000
+++ b/lang/scm/patches/patch-aa Sun Feb 19 17:50:11 2006 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2005/10/25 09:32:15 adam Exp $
+$NetBSD: patch-aa,v 1.3 2006/02/19 17:50:11 joerg Exp $
--- Makefile.orig 2005-06-24 01:20:35.000000000 +0000
+++ Makefile
+@@ -44,7 +44,7 @@
+ SHELL = /bin/sh
+ #CC = gcc
+ #CFLAGS = -g
+-#LIBS =
++LIBS = -lm
+ #LD = $(CC) -g
+ LD = $(CC)
+ SCMLIT = ./scmlit
@@ -97,7 +97,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o
# ramap.o
ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-ac Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- scmfig.h.orig 2006-02-08 17:51:31.000000000 +0000
++++ scmfig.h
+@@ -793,20 +793,6 @@ typedef SCM *SCMPTR;
+ gc_for_open_files();\
+ else if (!SCM_INTERRUPTED(errno)) break;}}
+
+-#ifndef MSDOS
+-# ifdef ARM_ULIB
+- extern volatile int errno;
+-# else
+- extern int errno;
+-# endif
+-#endif
+-#ifdef __TURBOC__
+-# if (__TURBOC__==1)
+- /* Needed for TURBOC V1.0 */
+- extern int errno;
+-# endif
+-#endif
+-
+ /* EXIT_SUCCESS is the default code to return from SCM if no errors
+ were encountered. EXIT_FAILURE is the default code to return from
+ SCM if errors were encountered. The return code can be explicitly
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-ad Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- findexec.c.orig 2006-02-08 17:53:00.000000000 +0000
++++ findexec.c
+@@ -78,7 +78,7 @@ Wed Feb 21 23:06:35 1996 Aubrey Jaffer
+ # ifndef __STDC__
+ # define const /**/
+ # endif
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* This might be same for 44bsd derived system. */
+ # include <sys/types.h>
+ # include <sys/stat.h>
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-ae Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- time.c.orig 2006-02-08 17:55:21.000000000 +0000
++++ time.c
+@@ -111,7 +111,7 @@
+ # include <sys/times.h>
+ # define USE_GETTIMEOFDAY
+ #endif
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <sys/types.h>
+ # include <sys/time.h>
+ # include <sys/timeb.h>
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-af Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-af,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- scmmain.c.orig 2006-02-08 17:59:55.000000000 +0000
++++ scmmain.c
+@@ -43,7 +43,7 @@
+ Author: Aubrey Jaffer */
+
+ /* added by Dai Inukai 2001-03-21*/
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <floatingpoint.h>
+ #endif
+
+@@ -114,7 +114,7 @@ int main(argc, argv)
+ int nargc, iverbose = 0, buf0stdin;
+ SCM retval;
+ /* added by Dai Inukai 2001-03-21 */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ fp_prec_t fpspec;
+ #endif
+
+@@ -135,7 +135,7 @@ int main(argc, argv)
+ init_sbrk(); /* Do this before malloc()s. */
+ #endif
+ /* added by Dai Inukai 2001-03-21 */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ fpspec = fpsetprec(FP_PE); /* IEEE 64 bit FP mantissa*/
+ #endif
+ execpath = 0; /* even when dumped */
+@@ -176,7 +176,7 @@ int main(argc, argv)
+ if (execpath) free(execpath);
+ execpath = 0;
+ /* added by Dai Inukai 2001-03-27 */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ fpspec = fpsetprec(fpspec); /* Set back to FP_PD which is 53 bit FP. */
+ /* This may not be needed because the */
+ /* kernel is set to FP_PD by default. */
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-ag Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-ag,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- build.scm.orig 2006-02-19 17:31:59.000000000 +0000
++++ build.scm
+@@ -483,6 +483,7 @@
+ (gnu-win32 i386 unix gcc ) ;gcc
+ (djgpp i386 ms-dos gcc ) ;gcc
+ (freebsd i386 unix cc ) ;cc
++ (dragonfly i386 unix cc ) ;cc
+ (gcc *unknown* unix gcc ) ;gcc
+ (highc i386 ms-dos hc386 ) ;bind386
+ (hp-ux hp-risc hp-ux cc ) ;cc
+@@ -647,6 +648,14 @@
+ (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ())
+ (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
+ (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
++ (c dragonfly "" "-export-dynamic" #f () ())
++ (m dragonfly "" "-lm" #f () ())
++ (curses dragonfly "" "-lncurses" "/usr/lib/libncurses.a" () ())
++ (regex dragonfly "-I/usr/include/gnu" "-lgnuregex" "" () ())
++ (editline dragonfly "" "-lreadline" "" () ())
++ (dlll dragonfly "-DSUN_DL" "-export-dynamic" "" () ())
++ (nostart dragonfly "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
++ (dump dragonfly "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
+ (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
+ (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
+ (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
+@@ -1626,6 +1635,62 @@
+ (car (parameter-list-ref parms 'implvic))
+ oname ".so"))))
+
++(defcommand compile-c-files dragonfly
++ (lambda (files parms)
++ (and (batch:try-chopped-command
++ parms
++;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30
++ ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c"
++ "cc" "-O3 -pipe " "-c"
++ (c-includes parms)
++ (c-flags parms)
++ files)
++ (map c->o files))))
++(defcommand link-c-program dragonfly
++ (lambda (oname objects libs parms)
++ (batch:rename-file parms
++ oname (string-append oname "~"))
++ (and (batch:try-command parms
++ "cc" "-o" oname
++ (must-be-first
++ '("-nostartfiles"
++ "pre-crt0.o" "crt0.o"
++ "/usr/lib/crt0.o")
++ (append objects libs)))
++ oname)))
++(defcommand compile-dll-c-files dragonfly
++ (lambda (files parms)
++ (and (batch:try-chopped-command
++ parms "cc" "-O3 -pipe " "-fPIC" "-c"
++ (c-includes parms) (c-flags parms) files)
++ (let ((fnames (truncate-up-to (map c-> files) #\/)))
++ (and (batch:try-command
++ parms "cc" "-shared"
++ (cond
++ ((equal? (car fnames) "edline") "-lreadline")
++ ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4")
++ (else ""))
++ "-o" (string-append (car fnames) ".so")
++ (map (lambda (fname) (string-append fname ".o")) fnames))
++ (for-each (lambda (fname)
++ (batch:delete-file
++ parms (string-append fname ".o")))
++ fnames)
++ (list (string-append (car fnames) ".so")))))))
++(defcommand make-dll-archive dragonfly
++ (lambda (oname objects libs parms)
++ (and (batch:try-command
++ parms
++ "cc" "-shared" "-o"
++ (string-append
++ (car (parameter-list-ref parms 'implvic))
++ oname ".so")
++ objects)
++ (batch:rebuild-catalog parms)
++ (string-append
++ (car (parameter-list-ref parms 'implvic))
++ oname ".so"))))
++
+ (defcommand compile-c-files darwin
+ (lambda (files parms)
+ (and (batch:try-chopped-command
diff -r 5eb6759ac751 -r dd5f003e7f7d lang/scm/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scm/patches/patch-ah Sun Feb 19 17:50:11 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2006/02/19 17:50:11 joerg Exp $
+
+--- ioext.c.orig 2006-02-19 17:41:00.000000000 +0000
++++ ioext.c
+@@ -70,6 +70,9 @@ SCM stat2scm P((struct stat *stat_temp))
+ #ifdef __FreeBSD__
+ # include <unistd.h>
+ #endif
++#ifdef __DragonFly__
++# include <unistd.h>
++#endif
+ #ifdef __NetBSD__
+ # include <unistd.h>
+ #endif
Home |
Main Index |
Thread Index |
Old Index