[csw-devel] SF.net SVN: gar:[4904] csw/mgar/pkg/python/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Sat May 16 17:54:01 CEST 2009
Revision: 4904
http://gar.svn.sourceforge.net/gar/?rev=4904&view=rev
Author: valholla
Date: 2009-05-16 15:54:00 +0000 (Sat, 16 May 2009)
Log Message:
-----------
move modules to unversioned dir
Modified Paths:
--------------
csw/mgar/pkg/python/trunk/Makefile
csw/mgar/pkg/python/trunk/checksums
csw/mgar/pkg/python/trunk/files/configure.diff
csw/mgar/pkg/python/trunk/files/python-config-in.diff
csw/mgar/pkg/python/trunk/files/setup.diff
csw/mgar/pkg/python/trunk/files/site.diff
Modified: csw/mgar/pkg/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/python/trunk/Makefile 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/Makefile 2009-05-16 15:54:00 UTC (rev 4904)
@@ -55,6 +55,7 @@
CONFIGURE_ARGS += --enable-ipv6
CONFIGURE_ARGS += --enable-unicode=ucs4
CONFIGURE_ARGS += --with-fpectl
+CONFIGURE_ARGS += --with-system-ffi
CONFIGURE_ARGS += LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib'
PKGFILES_CSWidle = $(libdir)/python(\d+(?:\.\d+)*)/idlelib/.*
Modified: csw/mgar/pkg/python/trunk/checksums
===================================================================
--- csw/mgar/pkg/python/trunk/checksums 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/checksums 2009-05-16 15:54:00 UTC (rev 4904)
@@ -1,12 +1,12 @@
-e81c2f0953aa60f8062c05a4673f2be0 download/Python-2.6.1.tar.bz2
+245db9f1e0f09ab7e0faaa0cf7301011 download/Python-2.6.2.tar.bz2
+9b45df21739387380ba2f5737a443170 download/configure.diff
+42dd6523beb94a805d5764ae1276091c download/faqwiz.diff
+5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386
a87896c48b2f61b32053e6d02b07b022 download/libpython2.5.so.1.0-isa-sparcv8
-5664b3970307d7d39d8d4061e7dccbb0 download/libpython2.5.so.1.0-isa-i386
-42dd6523beb94a805d5764ae1276091c download/faqwiz.diff
33f4094ee46ce865d3973a197f3fb4a0 download/makesetup.diff
b389061e5a556feab6b20a08dad7ea23 download/modules.diff
369c5593c0c0edda03f3c1844788dbee download/multiprocess.diff
05724da367b025ce525de2bb704af6e3 download/pyport.diff
-296f46fb4a6a392093120cd86675309b download/setup.diff
-918c25923436792b353fac29acc88c22 download/site.diff
-9b45df21739387380ba2f5737a443170 download/configure.diff
60ffb8b1ad45d337f57b94c5a703e62a download/python-config-in.diff
+48577bbc43b912a4df66d09b54bd61ae download/setup.diff
+0c552473ba31916ca04d05af04b9f110 download/site.diff
Modified: csw/mgar/pkg/python/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/configure.diff 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/files/configure.diff 2009-05-16 15:54:00 UTC (rev 4904)
@@ -6,7 +6,7 @@
elif test `uname -p` = sparc;
- then CCSHARED="-xcode=pic32";
- else CCSHARED="-Kpic";
-+ then CCSHARED="-xO3 -xarch=v8";
++ then CCSHARED="-xO3";
fi;;
hp*|HP*) if test "$GCC" = yes;
then CCSHARED="-fPIC";
Modified: csw/mgar/pkg/python/trunk/files/python-config-in.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/files/python-config-in.diff 2009-05-16 15:54:00 UTC (rev 4904)
@@ -5,6 +5,6 @@
if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL'))
+ if opt == '--ldflags':
-+ libs.insert(0, '-R/opt/csw/lib -L/opt/csw/lib')
++ libs.insert(0, '-R/opt/csw/lib/$ISALIST -L/opt/csw/lib')
print ' '.join(libs)
Modified: csw/mgar/pkg/python/trunk/files/setup.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/setup.diff 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/files/setup.diff 2009-05-16 15:54:00 UTC (rev 4904)
@@ -109,13 +109,3 @@
else: # Linux and other unices
macros = dict(
HAVE_SEM_OPEN=1,
-@@ -1741,9 +1706,6 @@
- sources=['_ctypes/_ctypes_test.c'])
- self.extensions.extend([ext, ext_test])
-
-- if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-- return
--
- if sys.platform == 'darwin':
- # OS X 10.5 comes with libffi.dylib; the include files are
- # in /usr/include/ffi
Modified: csw/mgar/pkg/python/trunk/files/site.diff
===================================================================
--- csw/mgar/pkg/python/trunk/files/site.diff 2009-05-16 15:08:26 UTC (rev 4903)
+++ csw/mgar/pkg/python/trunk/files/site.diff 2009-05-16 15:54:00 UTC (rev 4904)
@@ -1,25 +1,77 @@
---- Python-2.6.1/Lib/site.py.orig 2009-02-23 15:13:02.813997871 -0600
-+++ Python-2.6.1/Lib/site.py 2009-02-23 15:20:00.516392336 -0600
-@@ -268,7 +268,21 @@
+--- 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" + sys.version[:3],
++ "python",
"site-packages"))
-- sitedirs.append(os.path.join(prefix, "lib", "site-python"))
-+ sitedirs.append(os.path.join(prefix, "lib",
-+ "python",
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, "lib",
-+ "python2.5",
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, "lib",
-+ "python2.3",
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, "lib",
-+ "python2.1",
-+ "site-packages"))
-+ sitedirs.append(os.path.join(prefix, "lib",
-+ "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