Revision: 24745
http://sourceforge.net/p/gar/code/24745
Author: cgrzemba
Date: 2015-03-22 10:31:08 +0000 (Sun, 22 Mar 2015)
Log Message:
-----------
lang-python/python/branches/python-2.7-dtrace: add DFLAG for 32bit build
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/Makefile
csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/files/05-dtrace.patch
Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/Makefile
2015-03-22 09:38:10 UTC (rev 24744)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/Makefile
2015-03-22 10:31:08 UTC (rev 24745)
@@ -100,6 +100,7 @@
BASECFLAGS = $(CFLAGS)
EXTRA_COMMON_EXPORTS = BASECFLAGS
+EXTRA_BUILD_ENV = DFLAGS=-32
# To fix https://www.opencsw.org/mantis/view.php?id=5040
LINKER_IGNORE =
Modified:
csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/files/05-dtrace.patch
===================================================================
---
csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/files/05-dtrace.patch
2015-03-22 09:38:10 UTC (rev 24744)
+++
csw/mgar/pkg/lang-python/python/branches/python-2.7-dtrace/files/05-dtrace.patch
2015-03-22 10:31:08 UTC (rev 24745)
@@ -55,8 +55,8 @@
f->f_lineno = code->co_firstlineno;
f->f_iblock = 0;
---- Python-2.7.8/Python/ceval.c.~1~ 2014-06-29 19:05:46.000000000 -0700
-+++ Python-2.7.8/Python/ceval.c 2014-07-17 20:39:49.843868592 -0700
+--- Python-2.7.6/Python/ceval.c.~1~ 2013-11-09 23:36:41.000000000 -0800
++++ Python-2.7.6/Python/ceval.c 2014-05-14 13:04:01.334853206 -0700
@@ -19,6 +19,11 @@
#include <ctype.h>
@@ -69,7 +69,7 @@
#ifndef WITH_TSC
#define READ_TIMESTAMP(var)
-@@ -678,6 +683,55 @@
+@@ -672,6 +677,55 @@
NULL);
}
@@ -125,7 +125,7 @@
/* Interpreter main loop */
-@@ -689,9 +743,84 @@
+@@ -683,9 +737,84 @@
return PyEval_EvalFrameEx(f, 0);
}
@@ -210,7 +210,7 @@
#ifdef DXPAIRS
int lastopcode = 0;
#endif
-@@ -916,6 +1045,11 @@
+@@ -910,6 +1039,11 @@
}
}
@@ -222,7 +222,7 @@
co = f->f_code;
names = co->co_names;
consts = co->co_consts;
-@@ -2673,6 +2807,9 @@
+@@ -2660,6 +2794,9 @@
PyObject **sp;
PCALL(PCALL_ALL);
sp = stack_pointer;
@@ -232,7 +232,7 @@
#ifdef WITH_TSC
x = call_function(&sp, oparg, &intr0, &intr1);
#else
-@@ -2714,6 +2851,9 @@
+@@ -2701,6 +2838,9 @@
} else
Py_INCREF(func);
sp = stack_pointer;
@@ -242,7 +242,7 @@
READ_TIMESTAMP(intr0);
x = ext_do_call(func, &sp, flags, na, nk);
READ_TIMESTAMP(intr1);
-@@ -3014,6 +3154,10 @@
+@@ -3001,6 +3141,10 @@
/* pop frame */
exit_eval_frame:
@@ -408,9 +408,9 @@
+#pragma D attributes Private/Private/Common provider python function
+#pragma D attributes Evolving/Evolving/Common provider python name
+#pragma D attributes Evolving/Evolving/Common provider python args
---- Python-2.7.7/Lib/test/test_sys.py.~1~ 2014-05-31 11:58:39.000000000
-0700
-+++ Python-2.7.7/Lib/test/test_sys.py 2014-06-02 10:44:39.318709539 -0700
-@@ -594,7 +594,7 @@
+--- Python-2.7.6/Lib/test/test_sys.py.~1~ 2013-11-09 23:36:40.000000000
-0800
++++ Python-2.7.6/Lib/test/test_sys.py 2014-05-14 13:07:05.332748121 -0700
+@@ -612,7 +612,7 @@
nfrees = len(x.f_code.co_freevars)
extras = x.f_code.co_stacksize + x.f_code.co_nlocals +\
ncells + nfrees - 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
