Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11954
Added Files:
python24.info python24.patch
Log Message:
moved from unstable.
--- NEW FILE: python24.patch ---
--- Python-2.4/configure.orig Sat Dec 11 14:30:53 2004
+++ Python-2.4/configure Sat Dec 11 14:38:12 2004
@@ -3816,7 +3816,7 @@
;;
# is there any other compiler on Darwin besides gcc?
Darwin*)
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp
-mno-fused-madd"
+ BASECFLAGS="$BASECFLAGS -fno-common -Wno-long-double
-no-cpp-precomp -mno-fused-madd"
;;
esac
;;
@@ -10295,7 +10295,8 @@
LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX)
-framework $(PYTHONFRAMEWORK)'
else
# No framework. Ignore undefined symbols, assuming they
come from Python
- LDSHARED="$LDSHARED -undefined suppress"
+# LDSHARED="$LDSHARED -undefined suppress"
+ LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Darwin/1.4*|Darwin/5.*|Darwin/6.*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
@@ -10305,8 +10306,10 @@
LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX)
-framework $(PYTHONFRAMEWORK)'
else
# No framework, use the Python app as bundle-loader
- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
- LDSHARED="$LDSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
+# BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
+# LDSHARED="$LDSHARED "'-bundle_loader
$(BINDIR)/python$(VERSION)$(EXE)'
+ BLDSHARED="$LDSHARED -flat_namespace -undefined
suppress"
+ LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
fi ;;
Darwin/*)
# Use -undefined dynamic_lookup whenever possible (10.3 and
later).
--- Python-2.4//Makefile.pre.in.orig Sat Dec 11 14:25:10 2004
+++ Python-2.4/Makefile.pre.in Sat Dec 11 14:25:25 2004
@@ -56,7 +56,7 @@
OPT= @OPT@
BASECFLAGS= @BASECFLAGS@
CFLAGS= $(BASECFLAGS) $(OPT)
-CPPFLAGS= -I. -I$(srcdir)/Include
+CPPFLAGS= -I. -I$(srcdir)/Include [EMAIL PROTECTED]@/include
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
--- Python-2.4/Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004
+++ Python-2.4/Misc/setuid-prog.c Sat Dec 11 14:30:13 2004
@@ -70,6 +70,13 @@
#define environ _environ
#endif
+#if defined(__APPLE__)
+# include <sys/time.h>
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+#endif /* __APPLE__ */
+
+
/* don't change def_IFS */
char def_IFS[] = "IFS= \t\n";
/* you may want to change def_PATH, but you should really change it in */
--- Python-2.4/Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004
+++ Python-2.4/Modules/posixmodule.c Sat Dec 11 14:28:17 2004
@@ -298,7 +298,7 @@
#endif
/* Return a dictionary corresponding to the POSIX environment table */
-#ifdef WITH_NEXT_FRAMEWORK
+#ifdef __APPLE__
/* On Darwin/MacOSX a shared library or framework has no access to
** environ directly, we must obtain it with _NSGetEnviron().
*/
@@ -316,7 +316,7 @@
d = PyDict_New();
if (d == NULL)
return NULL;
-#ifdef WITH_NEXT_FRAMEWORK
+#ifdef __APPLE__
if (environ == NULL)
environ = *_NSGetEnviron();
#endif
--- Python-2.4/Lib/pydoc.py Mon Dec 13 11:24:02 2004
+++ Python-2.4/Lib/pydoc.py.orig Mon Dec 13 11:21:37 2004
@@ -1615,19 +1615,7 @@
def __init__(self, input, output):
self.input = input
self.output = output
- self.docdir = None
- execdir = os.path.dirname(sys.executable)
- homedir = os.environ.get('PYTHONHOME')
- for dir in [os.environ.get('PYTHONDOCS'),
- homedir and os.path.join(homedir, 'doc'),
- os.path.join(execdir, 'doc'),
- '/usr/doc/python-docs-' + split(sys.version)[0],
- '/usr/doc/python-' + split(sys.version)[0],
- '/usr/doc/python-docs-' + sys.version[:3],
- '/usr/doc/python-' + sys.version[:3],
- os.path.join(sys.prefix,
'Resources/English.lproj/Documentation')]:
- if dir and os.path.isdir(os.path.join(dir, 'lib')):
- self.docdir = dir
+ self.docdir = os.path.join(sys.prefix,
'share','doc','python'+sys.version[0]+sys.version[2],'html')
def __repr__(self):
if inspect.stack()[1][3] == '?':
--- Python-2.4/setup.py.orig Sat Dec 11 14:38:36 2004
+++ Python-2.4/setup.py Sat Dec 11 14:47:51 2004
@@ -245,8 +245,8 @@
# Add paths to popular package managers on OS X/darwin
if sys.platform == "darwin":
# Fink installs into /sw by default
- add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
- add_dir_to_list(self.compiler.include_dirs, '/sw/include')
+ add_dir_to_list(self.compiler.library_dirs, '@PREFIX@/lib')
+ add_dir_to_list(self.compiler.include_dirs, '@PREFIX@/include')
# DarwinPorts installs into /opt/local by default
add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
@@ -456,6 +456,7 @@
'/usr/contrib/ssl/include/'
]
)
+ ssl_incs = None # suppress SSL support.
if ssl_incs is not None:
krb5_h = find_file('krb5.h', inc_dirs,
['/usr/kerberos/include'])
@@ -499,11 +500,11 @@
'/usr/include/db4',
'/usr/local/include/db4',
'/opt/sfw/include/db4',
- '/sw/include/db4',
+ '@PREFIX@/include/db4',
'/usr/include/db3',
'/usr/local/include/db3',
'/opt/sfw/include/db3',
- '/sw/include/db3',
+ '@PREFIX@/include/db3',
]
# 4.x minor number specific paths
for x in (0,1,2,3):
@@ -968,9 +969,9 @@
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
platform = self.get_platform()
- if platform == 'darwin' and \
- self.detect_tkinter_darwin(inc_dirs, lib_dirs):
- return
+# if platform == 'darwin' and \
+# self.detect_tkinter_darwin(inc_dirs, lib_dirs):
+# return
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
--- NEW FILE: python24.info ---
Package: python24
Version: 2.4.1
Revision: 1
Epoch: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Conflicts: python24-nox, python-nox (<= 2.2.1-8)
Replaces: python24-nox, python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
Depends: %N-shlibs (= %e:%v-%r), tcltk (>= 8.4.1-1), python24-socket
BuildDepends: readline (>= 4.3-25), db42-ssl | db42, fink (>= 0.17.0-1), gdbm3,
gmp (>= 4.1.2-11), tcltk-dev, expat, bzip2-dev, gettext-dev, gettext-bin,
gettext-tools, libncurses5
Source: http://python.org/ftp/python/%v/Python-%v.tgz
Source2: http://www.python.org/ftp/python/doc/%v/html-%v.zip
Source-MD5: 7bb2416a4f421c3452d306694d3efbba
Source2-MD5: 0473c74be2c1a1459652614be7ee6f96
PatchScript: (sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1)
ConfigureParams: --mandir='${prefix}/share/man'
GCC: 3.3
InstallScript: <<
make install prefix=%i
(cd %i/bin; sed 's|%i/bin/python|%p/bin/python2.4|g' < idle > idle2.4; chmod
755 idle2.4; rm -f idle)
(cd %i/bin; sed 's|%p/bin/python|%p/bin/python2.4|g' < pydoc > pydoc2.4; chmod
755 pydoc2.4; rm -f pydoc)
(cd Misc; /bin/rm -rf RPM)
mkdir -p %i/share/doc/%n
/bin/cp -R Demo Doc %i/share/doc/%n
/bin/cp -R Misc Tools %i/lib/python2.4
/bin/rm -f %i/bin/python
/bin/mv %i/share/man/man1/python.1 %i/share/man/man1/python24.1
cc -dynamiclib -all_load -framework System -framework CoreServices -framework
Foundation %i/lib/python2.4/config/libpython2.4.a -o
%i/lib/python2.4/config/libpython2.4.dylib -install_name
%p/lib/python2.4/config/libpython2.4.dylib -current_version 2.4
-compatibility_version 2.4 -L%p/lib -ldl
(cd %i/lib/python2.4/config; mv Makefile Makefile.orig; sed 's|-fno-common||g'
< Makefile.orig > Makefile; /bin/rm -f Makefile.orig)
ln -s %p/bin/python2.4 %i/bin/python
ln -s %p/bin/pydoc2.4 %i/bin/pydoc
ln -s %p/bin/idle2.4 %i/bin/idle
ln -s %p/share/man/man1/python24.1 %i/share/man/man1/python.1
(mkdir -p %i/share/doc/%n/html; cd ..; /bin/cp -R Python-Docs-%v/
%i/share/doc/%n/html)
<<
SplitOff: <<
Package: %N-shlibs
Depends: readline-shlibs (>= 4.3-25), expat-shlibs, gdbm3-shlibs, gmp-shlibs
(>= 4.1.2-11), db42-ssl-shlibs | db42-shlibs, tcltk-shlibs (>= 8.4.1)
Conflicts: python24-nox-shlibs
Replaces: python24-nox-shlibs, python (<= 2.2.1-8), python-nox (<= 2.2.1-8)
Files: lib/python2.4/config/libpython2.4.dylib
Shlibs: %p/lib/python2.4/config/libpython2.4.dylib 2.4.0 python24-shlibs (>=
2.4-1) | python24-nox-shlibs (>= 2.4-1)
DocFiles: README LICENSE
<<
SplitOff2: <<
Package: python
Depends: python24
Conflicts: python-nox
Replaces: python-nox
Files: bin/pydoc bin/python bin/idle share/man/man1/python.1
DocFiles: README LICENSE
<<
SplitOff3: <<
Package: python24-socket
Replaces: python24-socket-ssl, python24-socket-nox
Files: lib/python2.4/lib-dynload/_socket.so
DocFiles: README LICENSE
Description: Socket plugin for python
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
DescDetail: <<
Python is often compared to Tcl, Perl, Scheme or Java.
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
Much help from Dave Morrison and Peter O'Gorman
<<
DescPackaging: All available extension modules are built.
License: OSI-Approved
Homepage: http://www.python.org
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
