SF.net SVN: gar:[23463] csw/mgar/pkg/lang-python/python/branches/python-3.4
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Apr 22 11:23:06 CEST 2014
Revision: 23463
http://sourceforge.net/p/gar/code/23463
Author: wahwah
Date: 2014-04-22 09:23:01 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
lang-python/python/branches/python-3.4: Module compilation fails with ld: fatal: use the -z help option for usage information
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile
csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums
Removed Paths:
-------------
csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff
Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2014-04-22 09:08:45 UTC (rev 23462)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.4/Makefile 2014-04-22 09:23:01 UTC (rev 23463)
@@ -1,12 +1,12 @@
# $Id$
NAME = Python
-VERSION = 3.3.2
-VER = 3.3
-DVER = 3-3
-UVER = 3_3
+VERSION = 3.4.0
+VER = 3.4
+DVER = 3-4
+UVER = 3_4
PVER = python$(VER)
-CVER = 33
+CVER = 34
# Known issues:
#
@@ -34,13 +34,13 @@
UPSTREAM_MASTER_SITES = http://python.org/ftp/python/
UFILES_REGEX = $(VER)\.\d+
-DISTFILES = $(DISTNAME).tar.bz2
+DISTFILES = $(DISTNAME).tar.xz
# Patches
-PATCHFILES += makesetup.diff
-PATCHFILES += modules.diff
-PATCHFILES += multiprocess.diff
-PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch
+# PATCHFILES += makesetup.diff
+# PATCHFILES += modules.diff
+# PATCHFILES += multiprocess.diff
+# PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch
PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch
PATCHFILES += 0007-Settings-for-Solaris.patch
@@ -53,9 +53,9 @@
# Installation paths are defined in:
# http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114
# http://wiki.debian.org/Python/MultiArch
-# GARFLAVOR = DBG
-# BUILD64 = 1
-# ISAEXEC = 1
+GARFLAVOR = DBG
+BUILD64 = 1
+ISAEXEC = 1
# There is a file name conflict over libffi.so symlink between libffi package
# and a gcc-java package. While it will ultimately belong to libffi_dev, the
@@ -69,6 +69,11 @@
EXTRA_COMMON_EXPORTS = BASECFLAGS
EXTRA_LINKER_FLAGS = -lsocket -lresolv -lrt
+# Otherwise function wcschar has a different prototype from what Python source
+# expects.
+CPPFLAGS = -D_XPG5
+EXTRA_COMMON_EXPORTS = CPPFLAGS
+
NOISALIST = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-shared
@@ -211,8 +216,13 @@
EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python
+MACHDEP = $(ISA)
+EXTRA_CONFIGURE_EXPORTS += MACHDEP
+
GARCOMPILER = GNU
+LINKER_IGNORE =
+
include gar/category.mk
# There is a file name conflict over libffi.so symlink between libffi package
@@ -221,6 +231,5 @@
# pkgchk -L CSWlibffi-dev
# (...)
# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev
-# EXTRA_LINKER_FLAGS += $(libdir)/ffi
+# EXTRA_LINKER_FLAGS += -L$(libdir)/ffi
# LDFLAGS += -L$(libdir)/ffi
-
Modified: csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2014-04-22 09:08:45 UTC (rev 23462)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.4/checksums 2014-04-22 09:23:01 UTC (rev 23463)
@@ -1 +1 @@
-7dffe775f3bea68a44f762a3490e5e28 Python-3.3.2.tar.bz2
+77c22725e14af3d71022cbfdebff4903 Python-3.4.0.tar.xz
Deleted: csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff 2014-04-22 09:08:45 UTC (rev 23462)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.4/files/site.diff 2014-04-22 09:23:01 UTC (rev 23463)
@@ -1,77 +0,0 @@
---- Python-2.6.2/Lib/site.py.o 2009-05-16 10:26:13.235499624 -0500
-+++ Python-2.6.2/Lib/site.py 2009-05-16 10:29:16.772710013 -0500
-@@ -266,9 +266,10 @@
- sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
- elif os.sep == '/':
- sitedirs.append(os.path.join(prefix, "lib",
-- "python" + sys.version[:3],
-+ "python",
- "site-packages"))
- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-+ sitedirs.append("/opt/csw/lib/python2.3/site-packages")
- else:
- sitedirs.append(prefix)
- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
---- Python-2.6.2/Lib/distutils/command/install.py.o 2009-05-16 10:29:46.625564211 -0500
-+++ Python-2.6.2/Lib/distutils/command/install.py 2009-05-16 10:31:26.296866583 -0500
-@@ -41,8 +41,8 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/lib/python/site-packages',
-+ 'platlib': '$platbase/lib/python/site-packages',
- 'headers': '$base/include/python$py_version_short/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- Python-2.6.2/Makefile.pre.in.o 2009-05-16 10:35:14.566752156 -0500
-+++ Python-2.6.2/Makefile.pre.in 2009-05-16 10:35:55.162080324 -0500
-@@ -94,11 +94,11 @@
- SCRIPTDIR= $(prefix)/lib
-
- # Detailed destination directories
--BINLIBDEST= $(LIBDIR)/python$(VERSION)
--LIBDEST= $(SCRIPTDIR)/python$(VERSION)
-+BINLIBDEST= $(LIBDIR)/python
-+LIBDEST= $(SCRIPTDIR)/python
- INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)
- CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)
--LIBP= $(LIBDIR)/python$(VERSION)
-+LIBP= $(LIBDIR)/python
-
- # Symbols used for using shared libraries
- SO= @SO@
---- Python-2.6.2/Modules/getpath.c.o 2009-05-16 10:44:29.756720713 -0500
-+++ Python-2.6.2/Modules/getpath.c 2009-05-16 10:45:33.735370122 -0500
-@@ -117,8 +117,8 @@
- #endif
-
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/lib/python:" \
-+ EXEC_PREFIX "/lib/python/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -129,7 +129,7 @@
- static char exec_prefix[MAXPATHLEN+1];
- static char progpath[MAXPATHLEN+1];
- static char *module_search_path = NULL;
--static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = "lib/python";
-
- static void
- reduce(char *dir)
---- Python-2.6.2/Lib/distutils/sysconfig.py.o 2009-05-16 10:48:24.271739485 -0500
-+++ Python-2.6.2/Lib/distutils/sysconfig.py 2009-05-16 10:49:21.413202445 -0500
-@@ -116,7 +116,7 @@
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ "lib", "python")
- if standard_lib:
- return libpython
- else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list