Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12478
Modified Files:
python31.info python31.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: python31.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python31.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python31.info 5 Jan 2012 17:27:17 -0000 1.3
+++ python31.info 31 May 2013 00:49:27 -0000 1.4
@@ -1,6 +1,6 @@
Info2: <<
Package: python%type_pkg[python]
-Version: 3.1.4
+Version: 3.1.5
Revision: 3
Type: python 3.1
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
@@ -11,6 +11,7 @@
gdbm3-shlibs,
libgettext8-shlibs,
libncursesw5-shlibs,
+ openssl100-shlibs (>= 1.0.1-1),
readline5-shlibs,
sqlite3-shlibs (>= 3.7.2-2),
tcltk (>= 8.4.1-1),
@@ -20,7 +21,7 @@
BuildDepends: <<
blt-dev (>= 2.4z-15),
bzip2-dev,
- fink (>= 0.24.12-1),
+ fink (>= 0.28),
gdbm3,
gettext-bin,
gettext-tools,
@@ -28,25 +29,27 @@
libncursesw5,
readline5,
sqlite3-dev (>= 3.7.2-2),
- system-openssl-dev,
+ openssl100-dev (>= 1.0.1-1),
tcltk-dev (>= 8.4.1-1),
x11-dev
<<
Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source-MD5: 09ed98eace4c403b475846702708675e
+Source-MD5: dc8a7a96c12880d2e61e9f4add9d3dc7
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: 0a4a56361005966cc38d1068dfd52a54
+Source2-MD5: b9a9d05d140b41df71496444ef0a6e4e
PatchFile: %n.patch
-PatchFile-MD5: 6d514a77c4d20a5485d5c563424abd97
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
-
+PatchFile-MD5: fccd243845722b7198d85a67caad3d94
+PatchScript: <<
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ sed -i.orig -e 's/import os/&, sys/' Lib/test/test_hash.py
+<<
UseMaxBuildJobs: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --enable-shared --with-dbmliborder=gdbm
CompileScript: <<
#!/bin/sh -ex
darwin_vers=`uname -r | cut -d. -f1`
- if [ "$darwin_vers" = 11 ]; then
+ if [ "$darwin_vers" -ge 11 ]; then
perl -pi -e 's/ -lSystemStubs//' ./configure
perl -pi -e 's/-O3/-fwrapv -O3/' ./configure
fi
@@ -60,7 +63,7 @@
%{default_script}
<<
-InfoTest: TestScript: LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x
test_distutils test_cmd_line test_argparse test_httpservers' || exit 2
+InfoTest: TestScript: LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x
test_distutils test_cmd_line test_argparse test_httpservers test_cmath' || exit
2
InstallScript: <<
#!/bin/sh -ex
@@ -68,9 +71,9 @@
export MAKEFLAGS=-j1
make install DESTDIR=%d
- # don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||; s|-lintl ||'
%i/lib/python%type_raw[python]/config/Makefile
-
+ # we don't want -lintl to appear in LIBS otherwise python-config will
propagate it
+ perl -pi -e 's/-lintl //' %i/lib/python%type_raw[python]/config/Makefile
+
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
@@ -180,6 +183,9 @@
with -O0 so force that in setup.py.
Patch ctypes to look in %p/lib for libraries.
+
+ Patch from http://hg.python.org/cpython/rev/eb46c8f44aae
+ to fix test_fixed_hash under big-endian systems.
<<
License: OSI-Approved
Homepage: http://www.python.org
Index: python31.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python31.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python31.patch 5 Jan 2012 17:27:17 -0000 1.3
+++ python31.patch 31 May 2013 00:49:27 -0000 1.4
@@ -214,40 +214,6 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -662,10 +665,9 @@
- depends = ['socketmodule.h']) )
- # Detect SSL support for the socket module (via _ssl)
- search_for_ssl_incs_in = [
-- '/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-+ '@PREFIX@/lib/system-openssl/include'
- ]
-- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-+ ssl_incs = find_file('openssl/ssl.h', [],
- search_for_ssl_incs_in
- )
- if ssl_incs is not None:
-@@ -673,9 +675,8 @@
- ['/usr/kerberos/include'])
- if krb5_h:
- ssl_incs += krb5_h
-- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-+ ssl_libs = find_library_file(self.compiler, 'ssl', [],
-+ ['@PREFIX@/lib/system-openssl/lib'
- ] )
-
- if (ssl_incs is not None and
-@@ -695,7 +696,7 @@
-
- # look for the openssl version header on the compiler search path.
- opensslv_h = find_file('openssl/opensslv.h', [],
-- inc_dirs + search_for_ssl_incs_in)
-+ search_for_ssl_incs_in)
- if opensslv_h:
- name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
- if sys.platform == 'darwin' and is_macosx_sdk_path(name):
@@ -938,12 +939,7 @@
# We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8
@@ -337,3 +303,24 @@
self.extensions.extend([ext, ext_test])
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+diff --git Python-3.1.4.orig/Lib/test/test_hash.py
Python-3.1.4/Lib/test/test_hash.py
+--- Python-3.1.4.orig/Lib/test/test_hash.py
++++ Python-3.1.4/Lib/test/test_hash.py
+@@ -170,9 +170,15 @@ class StringlikeHashRandomizationTests(H
+ # test a fixed seed for the randomized hash
+ # Note that all types share the same values:
+ if IS_64BIT:
+- h = -4410911502303878509
++ if sys.byteorder == 'little':
++ h = -4410911502303878509
++ else:
++ h = -3570150969479994130
+ else:
+- h = -206076799
++ if sys.byteorder == 'little':
++ h = -206076799
++ else:
++ h = -1024014457
+ self.assertEqual(self.get_hash(self.repr_, seed=42), h)
+
+ class StrHashRandomizationTests(StringlikeHashRandomizationTests):
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
