Added to ~ppc-macos. Thanks to Robin Munn <rmunn@pobox.com>, closing bug #62277.

4 files changed, 95 insertions, 4 deletions

diff --git a/dev-util/guile/ChangeLog b/dev-util/guile/ChangeLog
index edc8723843f4..9f8371a3dfd5 100644
--- a/dev-util/guile/ChangeLog
+++ b/dev-util/guile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/guile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.33 2004/09/19 15:20:01 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.34 2004/10/10 17:22:59 usata Exp $
+
+  11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/guile-macos-posix.patch, +files/guile-macos-relink.patch,
+  guile-1.6.4-r1.ebuild:
+  Added to ~ppc-macos. Thanks to Robin Munn <rmunn@pobox.com>,
+  closing bug #62277.
 
 *guile-1.6.4-r2 (19 Sep 2004)
 
diff --git a/dev-util/guile/files/guile-macos-posix.patch b/dev-util/guile/files/guile-macos-posix.patch
new file mode 100644
index 000000000000..c512a9e9fc56
--- /dev/null
+++ b/dev-util/guile/files/guile-macos-posix.patch
@@ -0,0 +1,40 @@
+--- libguile/posix.c.sav	Fri Feb 21 17:09:20 2003
++++ libguile/posix.c	Fri Feb 21 17:10:33 2003
+@@ -117,7 +117,12 @@
+ 
+ #include <signal.h>
+ 
++#if defined(__APPLE__) && defined(__DYNAMIC__)
++#include <crt_externs.h>
++char ** environ = NULL;
++#else
+ extern char ** environ;
++#endif
+ 
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+@@ -1036,6 +1041,9 @@
+            "then the return value is unspecified.")
+ #define FUNC_NAME s_scm_environ
+ {
++#if defined(__APPLE__) && defined(__DYNAMIC__)
++  environ = *_NSGetEnviron();
++#endif
+   if (SCM_UNBNDP (env))
+     return scm_makfromstrs (-1, environ);
+   else
+@@ -1213,6 +1213,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;
+
diff --git a/dev-util/guile/files/guile-macos-relink.patch b/dev-util/guile/files/guile-macos-relink.patch
new file mode 100644
index 000000000000..35f93993fed2
--- /dev/null
+++ b/dev-util/guile/files/guile-macos-relink.patch
@@ -0,0 +1,38 @@
+--- ltmain.sh.orig	Sat Oct  9 20:52:10 2004
++++ ltmain.sh	Sat Oct  9 20:53:34 2004
+@@ -2270,7 +2270,7 @@
+ 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
++	    need_relink=no
+ 	  fi
+ 	  # This is a shared library
+ 	
+--- pre-inst-guile.in  Sun Dec  8 07:41:28 2002
++++ pre-inst-guile.in       Sat May  3 22:31:00 2003
+@@ -50,6 +50,23 @@
+     exit 1
+ }
+ 
++# the load library path is needed during the install phase (when guile looks
++# for libraries in $prefix/lib, but they have not been installed yet)
++
++guile_libdir="${top_srcdir}/libguile/.libs:${top_srcdir}/libguile-ltdl/.libs"
++
++# handle DYLD_LIBRARY_PATH (no clobber)
++if [ x"$DYLD_LIBRARY_PATH" = x ] ; then
++    DYLD_LIBRARY_PATH="${guile_libdir}"
++else
++    # This hair prevents double inclusion.
++    # The ":" prevents prefix aliasing.
++    case x"$DYLD_LIBRARY_PATH" in x*${guile_libdir}:*) ;;
++      *) DYLD_LIBRARY_PATH="${guile_libdir}:$DYLD_LIBRARY_PATH" ;;
++    esac
++fi
++export DYLD_LIBRARY_PATH
++
+ # handle GUILE_LOAD_PATH (no clobber)
+ if [ x"$GUILE_LOAD_PATH" = x ] ; then
+     GUILE_LOAD_PATH="${top_srcdir}"
+
diff --git a/dev-util/guile/guile-1.6.4-r1.ebuild b/dev-util/guile/guile-1.6.4-r1.ebuild
index 01c8c1c19176..0ab76d7cbce7 100644
--- a/dev-util/guile/guile-1.6.4-r1.ebuild
+++ b/dev-util/guile/guile-1.6.4-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.4-r1.ebuild,v 1.18 2004/08/21 00:24:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.4-r1.ebuild,v 1.19 2004/10/10 17:22:59 usata Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils libtool
 
 DESCRIPTION="Scheme interpreter"
 HOMEPAGE="http://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ~ppc-macos"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
@@ -32,6 +32,13 @@ src_compile() {
 		epatch ${FILESDIR}/guile-amd64.patch
 	fi
 
+	if use ppc-macos ; then
+		elibtoolize
+		epatch ${FILESDIR}/guile-macos-posix.patch
+		epatch ${FILESDIR}/guile-macos-relink.patch
+		append-flags -no-cpp-precomp -Dmacosx
+	fi
+
 	econf \
 		--with-threads \
 		--with-modules || die