[23072] trunk/dports/lang/guile
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 24 01:00:59 PDT 2007
Revision: 23072
http://trac.macosforge.org/projects/macports/changeset/23072
Author: markd at macports.org
Date: 2007-03-24 01:00:59 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
Closes #11185. Update to 1.8.1.
Modified Paths:
--------------
trunk/dports/lang/guile/Portfile
Added Paths:
-----------
trunk/dports/lang/guile/files/add-osx-stackbase.diff
trunk/dports/lang/guile/files/fix-64bit-problems.diff
trunk/dports/lang/guile/files/fix-srfi-14-test.diff
Removed Paths:
-------------
trunk/dports/lang/guile/files/patch-guile.c
trunk/dports/lang/guile/files/patch-posix.c
trunk/dports/lang/guile/files/patch-scmsigs.c
Modified: trunk/dports/lang/guile/Portfile
===================================================================
--- trunk/dports/lang/guile/Portfile 2007-03-24 07:42:22 UTC (rev 23071)
+++ trunk/dports/lang/guile/Portfile 2007-03-24 08:00:59 UTC (rev 23072)
@@ -1,8 +1,8 @@
# $Id$
PortSystem 1.0
-name guile
-version 1.6.8
+name guile-1.8
+version 1.8.1
categories lang
maintainers nomaintainer at macports.org
platforms darwin
@@ -23,11 +23,6 @@
interface, powerful string processing, and many other \
features needed for programming in the real world.
-#bugs On Apple's darwin, the putenv library function acts \
-# differently than the GNU version. The patch to \
-# libguile/posix.c fixes this, so the guile 'putenv' \
-# function doesn't throw a system error.
-
#user_notes You may need to set the environment variable \
# DYLD_LIBRARY_PATH to /opt/local/lib (or wherever \
# the guile libraries have been installed) if you want \
@@ -35,24 +30,25 @@
# libguile. This should only apply to developers using \
# guile as an extension language.
+distname guile-${version}
homepage http://www.gnu.org/software/guile/guile.html
-master_sites gnu
+master_sites ftp://ftp.gnu.org/pub/gnu/guile/
-checksums md5 2756b01f428b910d33267aeaa0e2d59a
+checksums md5 be792074780d597208a8cdfed976f559
-patchfiles patch-scmsigs.c \
- patch-posix.c \
- patch-guile.c
+patchfiles fix-64bit-problems.diff \
+ fix-srfi-14-test.diff \
+ add-osx-stackbase.diff
-depends_lib port:readline
+depends_lib port:readline port:gmp
-configure.args CPPFLAGS="-I${prefix}/include" \
- LDFLAGS=-L${prefix}/lib \
- --infodir=${prefix}/share/info \
- --mandir=${prefix}/share/man
+configure.args CPPFLAGS="-I${prefix}/include" \
+ LDFLAGS="-L${prefix}/lib" \
+ --infodir="${prefix}/share/info" \
+ --mandir="${prefix}/share/man"
platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
+ depends_lib-append port:dlcompat
}
platform darwin 8 {
@@ -61,11 +57,7 @@
CXX=/usr/bin/g++-4.0
}
-variant darwin {
- configure.args-append CFLAGS="-no-cpp-precomp -Dmacosx"
- }
+#post-destroot {
+# file delete ${destroot}${prefix}/share/${name}/1.6/ice-9/and-let\*.scm
+# }
-post-destroot {
- file delete ${destroot}${prefix}/share/${name}/1.6/ice-9/and-let\*.scm
- }
-
Added: trunk/dports/lang/guile/files/add-osx-stackbase.diff
===================================================================
--- trunk/dports/lang/guile/files/add-osx-stackbase.diff (rev 0)
+++ trunk/dports/lang/guile/files/add-osx-stackbase.diff 2007-03-24 08:00:59 UTC (rev 23072)
@@ -0,0 +1,30 @@
+--- ../guile-1.8.1.orig/libguile/threads.c 2006-07-29 21:00:17.000000000 +0300
++++ ./libguile/threads.c 2006-12-26 12:37:51.000000000 +0200
+@@ -571,14 +571,17 @@
+ }
+
+ #if SCM_USE_PTHREAD_THREADS
+-/* pthread_getattr_np not available on MacOS X and Solaris 10. */
+-#if HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP
++/* pthread_getattr_np not available on Solaris 10. */
++#if (HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP) || defined(__APPLE__)
+
+ #define HAVE_GET_THREAD_STACK_BASE
+
+ static SCM_STACKITEM *
+ get_thread_stack_base ()
+ {
++#if defined(__APPLE__)
++ return pthread_get_stackaddr_np (pthread_self ());
++#else /* !defined(__APPLE__) */
+ pthread_attr_t attr;
+ void *start, *end;
+ size_t size;
+@@ -604,6 +607,7 @@
+ return end;
+ #endif
+ }
++#endif /* defined(__APPLE__) */
+ }
+
+ #endif /* HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP */
Added: trunk/dports/lang/guile/files/fix-64bit-problems.diff
===================================================================
--- trunk/dports/lang/guile/files/fix-64bit-problems.diff (rev 0)
+++ trunk/dports/lang/guile/files/fix-64bit-problems.diff 2007-03-24 08:00:59 UTC (rev 23072)
@@ -0,0 +1,209 @@
+Index: sid/srfi/srfi-60.c
+===================================================================
+--- sid.orig/srfi/srfi-60.c 2006-11-30 23:40:16.000000000 -0800
++++ ./srfi/srfi-60.c 2006-11-30 23:40:18.000000000 -0800
+@@ -59,7 +59,7 @@
+
+
+ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
+- (SCM index, SCM n, SCM bit),
++ (SCM index, SCM n, SCM newbit),
+ "Return @var{n} with the bit at @var{index} set according to\n"
+ "@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
+ "to 1, or @code{#f} to set it to 0. Bits other than at\n"
+@@ -75,7 +75,7 @@
+ int bb;
+
+ ii = scm_to_ulong (index);
+- bb = scm_to_bool (bit);
++ bb = scm_to_bool (newbit);
+
+ if (SCM_I_INUMP (n))
+ {
+@@ -86,7 +86,7 @@
+ if (ii < SCM_LONG_BIT-1)
+ {
+ nn &= ~(1L << ii); /* zap bit at index */
+- nn |= (bb << ii); /* insert desired bit */
++ nn |= (((unsigned long) bb) << ii); /* insert desired bit */
+ return scm_from_long (nn);
+ }
+ else
+Index: sid/test-suite/tests/numbers.test
+===================================================================
+--- sid.orig/test-suite/tests/numbers.test 2006-11-30 23:40:16.000000000 -0800
++++ ./test-suite/tests/numbers.test 2006-12-01 18:33:27.000000000 -0800
+@@ -2243,7 +2243,7 @@
+
+ (with-test-prefix "big / real"
+ (pass-if (nan? (max big*5 +nan.0)))
+- (pass-if (= big*5 (max big*5 -inf.0)))
++ (pass-if (eqv? (exact->inexact big*5) (max big*5 -inf.0)))
+ (pass-if (= +inf.0 (max big*5 +inf.0)))
+ (pass-if (= 1.0 (max (- big*5) 1.0)))
+ (pass-if (inexact? (max big*5 1.0)))
+@@ -2252,7 +2252,7 @@
+ (with-test-prefix "real / big"
+ (pass-if (nan? (max +nan.0 big*5)))
+ (pass-if (= +inf.0 (max +inf.0 big*5)))
+- (pass-if (= big*5 (max -inf.0 big*5)))
++ (pass-if (eqv? (exact->inexact big*5) (max -inf.0 big*5)))
+ (pass-if (= 1.0 (max 1.0 (- big*5))))
+ (pass-if (inexact? (max 1.0 big*5)))
+ (pass-if (= (exact->inexact big*5) (max 1.0 big*5))))
+@@ -2370,7 +2370,7 @@
+
+ (with-test-prefix "big / real"
+ (pass-if (nan? (min big*5 +nan.0)))
+- (pass-if (= big*5 (min big*5 +inf.0)))
++ (pass-if (eqv? (exact->inexact big*5) (min big*5 +inf.0)))
+ (pass-if (= -inf.0 (min big*5 -inf.0)))
+ (pass-if (= 1.0 (min big*5 1.0)))
+ (pass-if (inexact? (min (- big*5) 1.0)))
+@@ -2378,7 +2378,7 @@
+
+ (with-test-prefix "real / big"
+ (pass-if (nan? (min +nan.0 big*5)))
+- (pass-if (= big*5 (min +inf.0 big*5)))
++ (pass-if (eqv? (exact->inexact big*5) (min +inf.0 big*5)))
+ (pass-if (= -inf.0 (min -inf.0 big*5)))
+ (pass-if (= 1.0 (min 1.0 big*5)))
+ (pass-if (inexact? (min 1.0 (- big*5))))
+Index: sid/test-suite/standalone/test-conversion.c
+===================================================================
+--- sid.orig/test-suite/standalone/test-conversion.c 2006-12-01 18:18:40.000000000 -0800
++++ ./test-suite/standalone/test-conversion.c 2006-12-01 18:30:47.000000000 -0800
+@@ -29,7 +29,7 @@
+ if (r != result)
+ {
+ fprintf (stderr, "fail: scm_is_signed_integer (%s, %Ld, %Ld) == %d\n",
+- str, min, max, result);
++ str, (long long) min, (long long) max, result);
+ exit (1);
+ }
+ }
+@@ -114,7 +114,9 @@
+ if (r != result)
+ {
+ fprintf (stderr, "fail: scm_is_unsigned_integer (%s, %Lu, %Lu) == %d\n",
+- str, min, max, result);
++ str,
++ (unsigned long long) min, (unsigned long long) max,
++ result);
+ exit (1);
+ }
+ }
+@@ -234,7 +236,7 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_signed_int (%s, %Ld, %Ld) -> out of range\n",
+- str, min, max);
++ str, (long long) min, (long long) max);
+ exit (1);
+ }
+ }
+@@ -246,7 +248,7 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_signed_int (%s, %Ld, %Ld) -> wrong type\n",
+- str, min, max);
++ str, (long long) min, (long long) max);
+ exit (1);
+ }
+ }
+@@ -259,7 +261,7 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_signed_int (%s, %Ld, %Ld) = %Ld\n",
+- str, min, max, result);
++ str, (long long) min, (long long) max, (long long) result);
+ exit (1);
+ }
+ }
+@@ -366,7 +368,7 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_unsigned_int (%s, %Lu, %Lu) -> out of range\n",
+- str, min, max);
++ str, (unsigned long long) min, (unsigned long long) max);
+ exit (1);
+ }
+ }
+@@ -378,7 +380,7 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_unsigned_int (%s, %Lu, %Lu) -> wrong type\n",
+- str, min, max);
++ str, (unsigned long long) min, (unsigned long long) max);
+ exit (1);
+ }
+ }
+@@ -391,7 +393,9 @@
+ {
+ fprintf (stderr,
+ "fail: scm_to_unsigned_int (%s, %Lu, %Lu) == %Lu\n",
+- str, min, max, result);
++ str,
++ (unsigned long long) min, (unsigned long long) max,
++ (unsigned long long) result);
+ exit (1);
+ }
+ }
+@@ -447,7 +451,7 @@
+ if (scm_is_false (scm_equal_p (scm_from_signed_integer (val), res)))
+ {
+ fprintf (stderr, "fail: scm_from_signed_integer (%Ld) == %s\n",
+- val, result);
++ (long long) val, result);
+ exit (1);
+ }
+ }
+@@ -479,7 +483,7 @@
+ if (scm_is_false (scm_equal_p (scm_from_unsigned_integer (val), res)))
+ {
+ fprintf (stderr, "fail: scm_from_unsigned_integer (%Lu) == %s\n",
+- val, result);
++ (unsigned long long) val, result);
+ exit (1);
+ }
+ }
+@@ -507,7 +511,8 @@
+
+ if (scm_is_false (scm_equal_p (n, r)))
+ {
+- fprintf (stderr, "fail: %s (%Ld) == %s\n", func, c_n, result);
++ fprintf (stderr, "fail: %s (%Ld) == %s\n",
++ func, (long long) c_n, result);
+ exit (1);
+ }
+ }
+@@ -521,7 +526,8 @@
+
+ if (scm_is_false (scm_equal_p (n, r)))
+ {
+- fprintf (stderr, "fail: %s (%Lu) == %s\n", func, c_n, result);
++ fprintf (stderr, "fail: %s (%Lu) == %s\n",
++ func, (unsigned long long) c_n, result);
+ exit (1);
+ }
+ }
+@@ -580,7 +586,8 @@
+ || data.result != result)
+ {
+ fprintf (stderr,
+- "fail: %s (%s) = %Ld\n", func_name, str, result);
++ "fail: %s (%s) = %Ld\n",
++ func_name, str, (long long) result);
+ exit (1);
+ }
+ }
+@@ -638,7 +645,8 @@
+ || data.result != result)
+ {
+ fprintf (stderr,
+- "fail: %s (%s) = %Ld\n", func_name, str, result);
++ "fail: %s (%s) = %Lu\n",
++ func_name, str, (unsigned long long) result);
+ exit (1);
+ }
+ }
Added: trunk/dports/lang/guile/files/fix-srfi-14-test.diff
===================================================================
--- trunk/dports/lang/guile/files/fix-srfi-14-test.diff (rev 0)
+++ trunk/dports/lang/guile/files/fix-srfi-14-test.diff 2007-03-24 08:00:59 UTC (rev 23072)
@@ -0,0 +1,13 @@
+Index: sid/test-suite/tests/srfi-14.test
+===================================================================
+--- sid.orig/test-suite/tests/srfi-14.test 2006-12-01 19:03:51.000000000 -0800
++++ ./test-suite/tests/srfi-14.test 2006-12-01 19:03:55.000000000 -0800
+@@ -290,7 +290,7 @@
+
+ (pass-if "char-set:punctuation (membership)"
+ (if (not %latin1)
+- (thrown 'unresolved)
++ (throw 'unresolved)
+ (let ((punctuation (char-set->list char-set:punctuation)))
+ (every? (lambda (8-bit-char)
+ (memq 8-bit-char punctuation))
Deleted: trunk/dports/lang/guile/files/patch-guile.c
===================================================================
--- trunk/dports/lang/guile/files/patch-guile.c 2007-03-24 07:42:22 UTC (rev 23071)
+++ trunk/dports/lang/guile/files/patch-guile.c 2007-03-24 08:00:59 UTC (rev 23072)
@@ -1,11 +0,0 @@
---- libguile/guile.c.org 2005-06-23 08:43:29.000000000 +0200
-+++ libguile/guile.c 2005-06-23 08:44:09.000000000 +0200
-@@ -88,7 +88,7 @@
- {
- #ifdef DYNAMIC_LINKING
- /* libtool automagically inserts this variable into your executable... */
-- extern const scm_lt_dlsymlist lt_preloaded_symbols[];
-+ extern const scm_lt_dlsymlist *lt_preloaded_symbols;
- scm_lt_dlpreload_default (lt_preloaded_symbols);
- #endif
- scm_boot_guile (argc, argv, inner_main, 0);
Deleted: trunk/dports/lang/guile/files/patch-posix.c
===================================================================
--- trunk/dports/lang/guile/files/patch-posix.c 2007-03-24 07:42:22 UTC (rev 23071)
+++ trunk/dports/lang/guile/files/patch-posix.c 2007-03-24 08:00:59 UTC (rev 23072)
@@ -1,16 +0,0 @@
---- libguile/posix.c.sav Tue Jan 25 19:01:44 2005
-+++ libguile/posix.c Tue Jan 25 19:01:55 2005
-@@ -1257,6 +1257,13 @@
- SCM_MEMORY_ERROR;
- strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
- ptr[SCM_STRING_LENGTH (str)] = 0;
-+#if defined(macosx)
-+ if (!strchr(ptr, '=')) {
-+ unsetenv(ptr);
-+ rv = 0;
-+ }
-+ else
-+#endif
- rv = putenv (ptr);
- if (rv < 0)
- SCM_SYSERROR;
Deleted: trunk/dports/lang/guile/files/patch-scmsigs.c
===================================================================
--- trunk/dports/lang/guile/files/patch-scmsigs.c 2007-03-24 07:42:22 UTC (rev 23071)
+++ trunk/dports/lang/guile/files/patch-scmsigs.c 2007-03-24 08:00:59 UTC (rev 23072)
@@ -1,11 +0,0 @@
---- libguile/scmsigs.c.sav Tue Feb 11 22:07:54 2003
-+++ libguile/scmsigs.c Tue Feb 11 22:08:18 2003
-@@ -66,7 +66,7 @@
- /* The thread system has its own sleep and usleep functions. */
- #ifndef USE_THREADS
-
--#if defined(MISSING_SLEEP_DECL)
-+#if defined(MISSING_SLEEP_DECL) && ! defined(macosx)
- int sleep ();
- #endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070324/6e435072/attachment.html
More information about the macports-changes
mailing list