Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11860/10.4/unstable/main/finkinfo/languages
Modified Files:
guile16.info guile16.patch
Log Message:
Declare the _environ symbol *before* using it.
Index: guile16.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/guile16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guile16.patch 24 Jan 2006 16:32:25 -0000 1.1
+++ guile16.patch 23 Aug 2006 00:58:56 -0000 1.2
@@ -83,32 +83,50 @@
+export PATH
+eval "$@"
diff -urN guile-1.6.7.orig/libguile/posix.c guile-1.6.7/libguile/posix.c
---- guile-1.6.7.orig/libguile/posix.c 2004-12-14 14:21:39.000000000 +0900
-+++ guile-1.6.7/libguile/posix.c 2005-02-28 23:08:00.000000000 +0900
-@@ -117,7 +117,12 @@
+--- guile-1.6.7.orig/libguile/posix.c 2004-12-14 00:21:39.000000000 -0500
++++ guile-1.6.7/libguile/posix.c 2006-08-22 20:11:16.000000000 -0400
+@@ -117,7 +117,17 @@
#include <signal.h>
-+#if defined(__APPLE__) && defined(__DYNAMIC__)
-+#include <crt_externs.h>
-+char ** environ = NULL;
++#if HAVE_CRT_EXTERNS_H
++#include <crt_externs.h> /* for Darwin _NSGetEnviron */
++#endif
++/* On Apple Darwin in a shared library there's no "environ" to access
++ directly, instead the address of that variable must be obtained with
++ _NSGetEnviron(). */
++#if HAVE__NSGETENVIRON
++#define environ (*_NSGetEnviron())
+#else
extern char ** environ;
+#endif
#ifdef HAVE_GRP_H
#include <grp.h>
-@@ -1068,6 +1073,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
-@@ -1257,6 +1265,13 @@
+@@ -159,9 +169,6 @@
+ # include <sys/file.h>
+ #endif
+
+-#if HAVE_CRT_EXTERNS_H
+-#include <crt_externs.h> /* for Darwin _NSGetEnviron */
+-#endif
+
+ /* Some Unix systems don't define these. CPP hair is dangerous, but
+ this seems safe enough... */
+@@ -200,12 +207,6 @@
+ above means that _POSIX_SOURCE may be #defined, which will
+ encourage header files to do strange things. */
+
+-/* On Apple Darwin in a shared library there's no "environ" to access
+- directly, instead the address of that variable must be obtained with
+- _NSGetEnviron(). */
+-#if HAVE__NSGETENVIRON && defined (PIC)
+-#define environ (*_NSGetEnviron())
+-#endif
+
+
+ SCM_SYMBOL (sym_read_pipe, "read pipe");
+@@ -1257,6 +1258,13 @@
SCM_MEMORY_ERROR;
strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
ptr[SCM_STRING_LENGTH (str)] = 0;
Index: guile16.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/guile16.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- guile16.info 7 Aug 2006 18:51:08 -0000 1.3
+++ guile16.info 23 Aug 2006 00:58:56 -0000 1.4
@@ -1,7 +1,7 @@
Package: guile16
Version: 1.6.7
-Revision: 1010
-BuildDepends: readline (>= 4.3-1028), libncurses5 (>= 5.4-20041023-1006)
+Revision: 1011
+BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006)
Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r)
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
@@ -55,7 +55,7 @@
share/guile/1.6
<<
DocFiles: COPYING
- Depends: readline-shlibs (>= 4.3-1028), %N-shlibs (= %v-%r)
+ Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile16
<<
SplitOff3: <<
@@ -89,6 +89,8 @@
ensure it links against the just built libs.
Patched makefiles to replace -export-dynamic with -module.
Made the main packages not conflict with guile-1.4
+
+Make sure to declare the darwinish _environ symbol before using it.
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
