haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-19 10:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

python: bump to 3.4.3.

Browse Source 
* remove the nano dep.
This commit is contained in:
Jerome Duval
2015-06-08 16:54:09 +00:00
parent 68c41785dd
commit c2ef230f78
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
dev-lang/python/patches/python3-3.4.0.patchset → dev-lang/python/patches/python3-3.4.3.patchset
View File

@@ -1,14 +1,14 @@
From 40e14d16905c97a6793dabe45ec7b2fd228f03b7 Mon Sep 17 00:00:00 2001
From aacc2ed7b074730d2ff7f03c6d162a578e73e059 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 10 Apr 2014 16:03:33 +0000
Subject: initial Haiku patch
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 456511c..6417b27 100644
index d768dc5..21e3fd5 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -58,6 +58,27 @@ INSTALL_SCHEMES = {
@@ -43,6 +43,27 @@ INSTALL_SCHEMES = {
'data' : '$base',
},
'nt': WINDOWS_SCHEME,
@@ -36,7 +36,7 @@ index 456511c..6417b27 100644
}
# user site schemes
@@ -79,6 +100,14 @@ if HAS_USER_SITE:
@@ -64,6 +85,14 @@ if HAS_USER_SITE:
'data' : '$userbase',
}
@@ -51,7 +51,7 @@ index 456511c..6417b27 100644
# The keys to an installation scheme; if any new types of files are to be
# installed, be sure to add an entry to every installation scheme above,
# and to SCHEME_KEYS here.
@@ -421,10 +450,16 @@ class install(Command):
@@ -406,10 +435,16 @@ class install(Command):
raise DistutilsPlatformError(
"User base directory is not specified")
self.install_base = self.install_platbase = self.install_userbase
@@ -70,7 +70,7 @@ index 456511c..6417b27 100644
else:
if self.prefix is None:
if self.exec_prefix is not None:
@@ -440,7 +475,13 @@ class install(Command):
@@ -425,7 +460,13 @@ class install(Command):
self.install_base = self.prefix
self.install_platbase = self.exec_prefix
@@ -86,7 +86,7 @@ index 456511c..6417b27 100644
def finalize_other(self):
"""Finalizes options for non-posix platforms"""
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 75537db..ed4c7af 100644
index a1452fe..07e2225 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -111,7 +111,8 @@ def get_python_inc(plat_specific=0, prefix=None):
@@ -126,7 +126,7 @@ index 75537db..ed4c7af 100644
if standard_lib:
return os.path.join(prefix, "Lib")
diff --git a/Lib/plat-haiku1/regen b/Lib/plat-haiku1/regen
new file mode 100755
new file mode 100644
index 0000000..4372ee2
--- /dev/null
+++ b/Lib/plat-haiku1/regen
@@ -136,7 +136,7 @@ index 0000000..4372ee2
+set -v
+eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $HEADERS/posix/netinet/in.h
diff --git a/Lib/site.py b/Lib/site.py
index 4fb1058..1894e3e 100644
index ad5d136..c00666c 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -303,7 +303,14 @@ def getsitepackages(prefixes=None):
@@ -168,10 +168,10 @@ index c37482e..96277a8 100644
# Somehow /dev/tty appears seekable on some BSDs
self.assertEqual(f.seekable(), False)
diff --git a/Makefile.pre.in b/Makefile.pre.in
index bd79fb3..0803e8c 100644
index 76aef28..4b06354 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -114,7 +114,7 @@ BINDIR= @bindir@
@@ -119,7 +119,7 @@ BINDIR= @bindir@
LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
@@ -181,10 +181,10 @@ index bd79fb3..0803e8c 100644
ABIFLAGS= @ABIFLAGS@
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 6cbc78f..3c2390a 100644
index 628dec2..5e6bb3f 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -11995,7 +11995,7 @@ all_ins(PyObject *m)
@@ -12023,7 +12023,7 @@ all_ins(PyObject *m)
if (PyModule_AddIntMacro(m, SCHED_FIFO)) return -1;
if (PyModule_AddIntMacro(m, SCHED_RR)) return -1;
#ifdef SCHED_SPORADIC
@@ -293,10 +293,10 @@ index 3a1cf09..bb56e30 100644
#endif
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index a1e5da8..24a780a 100644
index cb44d05..4023304 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -6087,7 +6087,9 @@ PyInit__socket(void)
@@ -6094,7 +6094,9 @@ PyInit__socket(void)
PyModule_AddIntMacro(m, SOCK_DGRAM);
/* We have incomplete socket support. */
PyModule_AddIntMacro(m, SOCK_RAW);
@@ -336,7 +336,7 @@ index 68ea1b5..1f5c3d0 100644
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 745457f..090fa2b 100644
index 4b4f979..48a2897 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -24,7 +24,7 @@
@@ -374,10 +374,10 @@ index 4f871d9..343e5ba 100755
def main():
global filedict
diff --git a/configure.ac b/configure.ac
index 25e1dc8..8b4b4cc 100644
index a0d0afa..aad64a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -953,7 +953,7 @@ if test $enable_shared = "yes"; then
@@ -956,7 +956,7 @@ if test $enable_shared = "yes"; then
PY3LIBRARY=libpython3.so
fi
;;
@@ -385,8 +385,8 @@ index 25e1dc8..8b4b4cc 100644
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Haiku*)
LDLIBRARY='libpython$(LDVERSION).so'
BLDLIBRARY='-L. -lpython$(LDVERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
@@ -961,6 +961,9 @@ if test $enable_shared = "yes"; then
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -964,6 +964,9 @@ if test $enable_shared = "yes"; then
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
;;
@@ -396,7 +396,7 @@ index 25e1dc8..8b4b4cc 100644
esac
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
@@ -1052,6 +1055,7 @@ AC_PROG_MKDIR_P
@@ -1055,6 +1058,7 @@ AC_PROG_MKDIR_P
AC_SUBST(LN)
if test -z "$LN" ; then
case $ac_sys_system in
@@ -404,8 +404,8 @@ index 25e1dc8..8b4b4cc 100644
CYGWIN*) LN="ln -s";;
*) LN=ln;;
esac
@@ -2049,7 +2053,7 @@ then
fi
@@ -2055,7 +2059,7 @@ then
BLDSHARED="$LDSHARED"
fi
;;
- Linux*|GNU*|QNX*)
@@ -413,7 +413,7 @@ index 25e1dc8..8b4b4cc 100644
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
BSD/OS*/4*)
@@ -2118,7 +2122,7 @@ then
@@ -2124,7 +2128,7 @@ then
then CCSHARED="-fPIC";
else CCSHARED="+z";
fi;;
@@ -422,7 +422,7 @@ index 25e1dc8..8b4b4cc 100644
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
OpenUNIX*|UnixWare*)
@@ -2149,7 +2153,7 @@ then
@@ -2155,7 +2159,7 @@ then
LINKFORSHARED="-Wl,-E -Wl,+s";;
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
@@ -431,7 +431,7 @@ index 25e1dc8..8b4b4cc 100644
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
@@ -2320,6 +2324,12 @@ esac
@@ -2329,6 +2333,12 @@ esac
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
@@ -444,7 +444,7 @@ index 25e1dc8..8b4b4cc 100644
AC_MSG_CHECKING(for --with-libs)
AC_ARG_WITH(libs,
AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]),
@@ -3654,6 +3664,7 @@ fi],
@@ -3663,6 +3673,7 @@ fi],
AC_SUBST(LIBM)
case $ac_sys_system in
Darwin) ;;
@@ -453,10 +453,10 @@ index 25e1dc8..8b4b4cc 100644
esac
AC_MSG_CHECKING(for --with-libm=STRING)
diff --git a/setup.py b/setup.py
index 8269e1c..2ee9731 100644
index 2779658..b1ff43a 100644
--- a/setup.py
+++ b/setup.py
@@ -517,6 +517,12 @@ class PyBuildExt(build_ext):
@@ -523,6 +523,12 @@ class PyBuildExt(build_ext):
config_h_vars = sysconfig.parse_config_h(file)
srcdir = sysconfig.get_config_var('srcdir')
@@ -469,7 +469,7 @@ index 8269e1c..2ee9731 100644
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if host_platform in ['osf1', 'unixware7', 'openunix8']:
@@ -544,9 +550,9 @@ class PyBuildExt(build_ext):
@@ -550,9 +556,9 @@ class PyBuildExt(build_ext):
if item.startswith('-L'):
lib_dirs.append(item[2:])
@@ -481,7 +481,7 @@ index 8269e1c..2ee9731 100644
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
@@ -754,15 +760,22 @@ class PyBuildExt(build_ext):
@@ -762,15 +768,22 @@ class PyBuildExt(build_ext):
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -507,7 +507,7 @@ index 8269e1c..2ee9731 100644
['/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
@@ -770,8 +783,8 @@ class PyBuildExt(build_ext):
@@ -778,8 +791,8 @@ class PyBuildExt(build_ext):
if (ssl_incs is not None and
ssl_libs is not None):
exts.append( Extension('_ssl', ['_ssl.c'],
@@ -518,7 +518,7 @@ index 8269e1c..2ee9731 100644
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
@@ -811,8 +824,8 @@ class PyBuildExt(build_ext):
@@ -819,8 +832,8 @@ class PyBuildExt(build_ext):
# of hash functions from the OpenSSL library.
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
depends = ['hashlib.h'],
@@ -529,7 +529,7 @@ index 8269e1c..2ee9731 100644
libraries = ['ssl', 'crypto']) )
else:
print("warning: openssl 0x%08x is too old for _hashlib" %
@@ -1236,7 +1249,7 @@ class PyBuildExt(build_ext):
@@ -1254,7 +1267,7 @@ class PyBuildExt(build_ext):
exts.append( Extension('resource', ['resource.c']) )
# Sun yellow pages. Some systems have the functions in libc.

7
dev-lang/python/python3-3.4.0.recipe → dev-lang/python/python3-3.4.3.recipe
View File

@@ -12,11 +12,11 @@ HOMEPAGE="http://www.python.org"
LICENSE="Python"
COPYRIGHT="1990-2015, Python Software Foundation"
SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
CHECKSUM_SHA256="f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe"
CHECKSUM_SHA256="b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8"
REVISION="1"
ARCHITECTURES="!x86_gcc2 !x86 x86_64"
PATCHES="python3-3.4.0.patchset"
PATCHES="python3-$portVersion.patchset"
PROVIDES="
python3 = $portVersion compat >= 3.4
@@ -41,7 +41,7 @@ PROVIDES="
"
REQUIRES="
haiku >= $haikuVersion
cmd:nano
cmd:file
lib:libbz2
lib:libexpat
lib:libncurses
@@ -69,7 +69,6 @@ BUILD_PREREQUIRES="
cmd:libtoolize
cmd:pkg_config
cmd:make
cmd:nano
cmd:python
"