pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2006Q1]: pkgsrc/lang/clisp Pullup ticket 1670 - requested by j...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8da681dcecca
branches:  pkgsrc-2006Q1
changeset: 510291:8da681dcecca
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed May 24 16:55:00 2006 +0000

description:
Pullup ticket 1670 - requested by joerg
build and other fixes for clisp

Revisions pulled up:
- pkgsrc/lang/clisp/Makefile            1.52, 1.54
- pkgsrc/lang/clisp/distinfo            1.12
- pkgsrc/lang/clisp/patches/patch-aa    1.13
- pkgsrc/lang/clisp/patches/patch-ab    1.9
- pkgsrc/lang/clisp/patches/patch-ac    1.7
- pkgsrc/lang/clisp/patches/patch-ad    1.7
- pkgsrc/lang/clisp/patches/patch-ae    1.7
- pkgsrc/lang/clisp/patches/patch-af    1.6
- pkgsrc/lang/clisp/patches/patch-ag    1.4

   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Tue Apr  4 19:12:10 UTC 2006

   Modified Files:
        pkgsrc/lang/clisp: Makefile

   Log Message:
   Fix build on amd64. Add same workaround for other 64-bit platforms.
   Remove outdated comment.

   From Martijn in PR 33189.
---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Wed May 10 18:26:34 UTC 2006

   Modified Files:
        pkgsrc/lang/clisp: Makefile distinfo
        pkgsrc/lang/clisp/patches: patch-aa
   Added Files:
        pkgsrc/lang/clisp/patches: patch-ab patch-ac patch-ad patch-ae patch-af
            patch-ag

   Log Message:
   Readd the various pieces for DragonFly. Explicitly disable mmap,
   it currently doesn't work.

diffstat:

 lang/clisp/Makefile         |  10 +++++++---
 lang/clisp/distinfo         |  10 ++++++++--
 lang/clisp/patches/patch-aa |  11 ++++++++++-
 lang/clisp/patches/patch-ab |  22 ++++++++++++++++++++++
 lang/clisp/patches/patch-ac |  13 +++++++++++++
 lang/clisp/patches/patch-ad |  13 +++++++++++++
 lang/clisp/patches/patch-ae |  13 +++++++++++++
 lang/clisp/patches/patch-af |  13 +++++++++++++
 lang/clisp/patches/patch-ag |  13 +++++++++++++
 9 files changed, 112 insertions(+), 6 deletions(-)

diffs (181 lines):

diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/Makefile
--- a/lang/clisp/Makefile       Wed May 24 00:05:43 2006 +0000
+++ b/lang/clisp/Makefile       Wed May 24 16:55:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/16 22:17:04 wiz Exp $
+# $NetBSD: Makefile,v 1.51.2.1 2006/05/24 16:55:00 ghen Exp $
 
 DISTNAME=      clisp-2.38
 CATEGORIES=    lang
@@ -9,14 +9,18 @@
 HOMEPAGE=      http://clisp.cons.org/
 COMMENT=       CLISP, a Common Lisp implementation
 
-# XXX: uncomment if still true (commented out during update to 2.38)
-#NOT_FOR_PLATFORM=     *-*-alpha *-*-x86_64    # severe LP64 problems
 # Sparc64 has assembler code problems, see
 # http://sourceforge.net/tracker/index.php?func=detail&aid=952681&group_id=1355&atid=101355
 NOT_FOR_PLATFORM=      *-*-sparc64
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
+MODULES+=              --disable-mmap
+.endif
+
 USE_PKGLOCALEDIR=      YES
 BUILD_DIRS=            src
 CONFIGURE_DIRS=                . modules/i18n modules/syscalls modules/pcre modules/rawsock \
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/distinfo
--- a/lang/clisp/distinfo       Wed May 24 00:05:43 2006 +0000
+++ b/lang/clisp/distinfo       Wed May 24 16:55:00 2006 +0000
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.11 2006/03/11 23:32:44 wiz Exp $
+$NetBSD: distinfo,v 1.11.2.1 2006/05/24 16:55:00 ghen Exp $
 
 SHA1 (clisp-2.38.tar.bz2) = d9586c04ed4778b5c603b3b1df73e8c76220df59
 RMD160 (clisp-2.38.tar.bz2) = 9070e1d7cd4db66de62f077b68a7fef7413da622
 Size (clisp-2.38.tar.bz2) = 8078151 bytes
-SHA1 (patch-aa) = b22797602a3cbd43fb56ad4a2a54f69d67979929
+SHA1 (patch-aa) = b5152788246655bcf0f527996a3278812e946a7a
+SHA1 (patch-ab) = b28180bff26e121bab0c53a07f2aafe5ff31e302
+SHA1 (patch-ac) = d0fcae585caf2559776c969db9699ccaf63005bc
+SHA1 (patch-ad) = c1f789f09e067a620ff74ac8677688ae9c6269bd
+SHA1 (patch-ae) = 7ba7ad6c6d399e00964df9c6cf7ff0a26c9dc814
+SHA1 (patch-af) = 5d26951e3712eabfac0888760224378ca19fe6fb
+SHA1 (patch-ag) = 3390c5bf98911bf6447e29af9688ec0b5e169bac
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-aa
--- a/lang/clisp/patches/patch-aa       Wed May 24 00:05:43 2006 +0000
+++ b/lang/clisp/patches/patch-aa       Wed May 24 16:55:00 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2006/03/11 23:32:44 wiz Exp $
+$NetBSD: patch-aa,v 1.12.2.1 2006/05/24 16:55:00 ghen Exp $
 
 --- src/makemake.in.orig       2006-01-23 21:07:27.000000000 +0000
 +++ src/makemake.in
@@ -15,3 +15,12 @@
    MANDIR="$mandir"
  fi
  if [ $HOS = unix ] ; then
+@@ -1334,7 +1334,7 @@ if [ "${with_dynamic_modules}" != no ]; 
+     freebsd2* | netbsd* | openbsd*)
+       XCC_CREATESHARED='ld -Bshareable -o $lib $libs'
+       ;;
+-    freebsd3* | gnu* | linux* | cygwin* )
++    freebsd3* | gnu* | linux* | cygwin* | dragonfly*)
+       XCC_CREATESHARED='$CC $CFLAGS $CLFLAGS -shared -o $lib $libs'
+       ;;
+     hpux9* | hpux10*)
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-ab       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.8.2.1 2006/05/24 16:55:00 ghen Exp $
+
+--- src/lispbibl.d.orig        2006-03-24 07:34:12.000000000 +0000
++++ src/lispbibl.d
+@@ -122,7 +122,7 @@
+   #if (defined(sun) && defined(unix) && defined(sun386))
+     #define SUN386
+   #endif
+-  #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__) || 
defined(__x86_64__) || defined(__amd64__)))
++  #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || 
defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
+     #define PC386
+   #endif
+   #if (defined(sun) && defined(unix) && defined(mc68020))
+@@ -232,7 +232,7 @@
+   #ifdef __NetBSD__
+     #define UNIX_NETBSD
+   #endif
+-  #ifdef __FreeBSD__
++  #if defined(__FreeBSD__) || defined(__DragonFly__)
+     #define UNIX_FREEBSD
+   #endif
+   #ifdef __OpenBSD__
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-ac       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6.16.1 2006/05/24 16:55:00 ghen Exp $
+
+--- src/asmi386.h.orig 2006-03-24 07:35:25.000000000 +0000
++++ src/asmi386.h
+@@ -231,7 +231,7 @@
+ 
+ #ifdef _MSC_VER
+ #define DECLARE_FUNCTION(name)
+-#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) 
|| defined(_SCO_ELF)
++#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || 
defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
+ #define DECLARE_FUNCTION(name) .type C(name),@function
+ #else
+ #define DECLARE_FUNCTION(name)
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-ad       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.6.16.1 2006/05/24 16:55:00 ghen Exp $
+
+--- src/asmi386.hh.orig        2006-03-24 07:35:56.000000000 +0000
++++ src/asmi386.hh
+@@ -231,7 +231,7 @@
+ // Define the DECLARE_FUNCTION(name) macro.
+ #ifdef _MSC_VER
+ #define DECLARE_FUNCTION(name)
+-#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) 
|| defined(_SCO_ELF)
++#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || 
defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
+ #define DECLARE_FUNCTION(name) .type C(name),@function
+ #else
+ #define DECLARE_FUNCTION(name)
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-ae       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.6.16.1 2006/05/24 16:55:00 ghen Exp $
+
+--- ffcall/avcall/asmi386.h.orig       2006-03-24 07:37:13.000000000 +0000
++++ ffcall/avcall/asmi386.h
+@@ -231,7 +231,7 @@
+ 
+ #ifdef _MSC_VER
+ #define DECLARE_FUNCTION(name)
+-#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) 
|| defined(_SCO_ELF)
++#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || 
defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
+ #define DECLARE_FUNCTION(name) .type C(name),@function
+ #else
+ #define DECLARE_FUNCTION(name)
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-af       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.5.16.1 2006/05/24 16:55:00 ghen Exp $
+
+--- ffcall/callback/vacall_r/asmi386.h.orig    2006-03-24 07:49:53.000000000 +0000
++++ ffcall/callback/vacall_r/asmi386.h
+@@ -231,7 +231,7 @@
+ 
+ #ifdef _MSC_VER
+ #define DECLARE_FUNCTION(name)
+-#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) 
|| defined(_SCO_ELF)
++#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || 
defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
+ #define DECLARE_FUNCTION(name) .type C(name),@function
+ #else
+ #define DECLARE_FUNCTION(name)
diff -r eea3b74b3440 -r 8da681dcecca lang/clisp/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clisp/patches/patch-ag       Wed May 24 16:55:00 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3.16.1 2006/05/24 16:55:00 ghen Exp $
+
+--- ffcall/vacall/asmi386.h.orig       2006-03-24 07:50:16.000000000 +0000
++++ ffcall/vacall/asmi386.h
+@@ -231,7 +231,7 @@
+ 
+ #ifdef _MSC_VER
+ #define DECLARE_FUNCTION(name)
+-#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__ROSE__) || defined(_SEQUENT_) || defined(DGUX) || defined(_SCO_COFF) 
|| defined(_SCO_ELF)
++#elif defined(__svr4__) || defined(__ELF__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__ROSE__) || defined(_SEQUENT_) || 
defined(DGUX) || defined(_SCO_COFF) || defined(_SCO_ELF)
+ #define DECLARE_FUNCTION(name) .type C(name),@function
+ #else
+ #define DECLARE_FUNCTION(name)



Home | Main Index | Thread Index | Old Index