Attachment #165724 for bug #206343

View | Details | Raw Unified | Return to bug 206343
Collapse All | Expand All

Lines 2-9 Link Here

(-)devel/scons/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scons	4	PORTNAME= scons
5	PORTVERSION= 2.3.0	5	PORTVERSION= 2.4.1
6	PORTREVISION= 1
7	CATEGORIES= devel python	6	CATEGORIES= devel python
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
9		8

Lines 1-2 Link Here

(-)devel/scons/distinfo (-2 / +2 lines)
1	SHA256 (scons-2.3.0.tar.gz) = 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b	1	SHA256 (scons-2.4.1.tar.gz) = 8fc4f42928c69bcbb33e1be94b646f2c700b659693fabc778c192d4d22f753a7
2	SIZE (scons-2.3.0.tar.gz) = 599514	2	SIZE (scons-2.4.1.tar.gz) = 638990




Index: engine/SCons/compat/_scons_subprocess.py
===================================================================
--- engine/SCons/compat/_scons_subprocess.py.orig	2015-11-09 11:25:09 UTC
+++ engine/SCons/compat/_scons_subprocess.py
@@ -569,13 +569,19 @@ def list2cmdline(seq):
     class object:
         pass
 
     return ''.join(result)
 
+import thread
+lock = thread.allocate_lock()
+

         _cleanup()
 
         self._child_created = False
@@ -643,6 +649,7 @@ class Popen(object):
                 self.stderr = os.fdopen(errread, 'rU', bufsize)
             else:
                 self.stderr = os.fdopen(errread, 'rb', bufsize)

Lines 1-4 Link Here

(-)devel/scons/files/patch-engine_SCons_Tool_m4.py (-1 / +1 lines)
1	--- engine/SCons/Tool/m4.py.orig 2013-03-03 14:48:40.000000000 +0000	1	--- engine/SCons/Tool/m4.py.orig 2015-11-09 11:25:09 UTC
2	+++ engine/SCons/Tool/m4.py	2	+++ engine/SCons/Tool/m4.py
3	@@ -49,7 +49,7 @@ def generate(env):	3	@@ -49,7 +49,7 @@ def generate(env):
4	# file and run from there.	4	# file and run from there.

Lines 1-5 Link Here

(-)devel/scons/files/patch-script__scons (-2 / +2 lines)
1	--- ./script/scons.orig 2013-04-19 23:35:11.656613793 -0400	1	--- script/scons.orig 2015-11-09 11:25:09 UTC
2	+++ ./script/scons 2013-04-19 23:35:16.127614561 -0400	2	+++ script/scons
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#! /usr/bin/env python	4	-#! /usr/bin/env python
5	+#! /usr/bin/env python2	5	+#! /usr/bin/env python2

Return to bug 206343

Lines 1-11 Link Here

(-)devel/scons/files/patch-engine-SCons-compat-_scons_subprocess.py (-6 / +6 lines)
1	Index: engine/SCons/compat/_scons_subprocess.py	1	Index: engine/SCons/compat/_scons_subprocess.py
2	===================================================================	2	===================================================================
3	--- engine/SCons/compat/_scons_subprocess.py (revision 2695)	3	--- engine/SCons/compat/_scons_subprocess.py.orig 2015-11-09 11:25:09 UTC
4	+++ engine/SCons/compat/_scons_subprocess.py (working copy)	4	+++ engine/SCons/compat/_scons_subprocess.py
5	@@ -581,13 +581,19 @@	5	@@ -569,13 +569,19 @@ def list2cmdline(seq):
6	class object:
7	pass
8		6
		7	return ''.join(result)
		8
9	+import thread	9	+import thread
10	+lock = thread.allocate_lock()	10	+lock = thread.allocate_lock()
11	+	11	+
Lines 23-29 Link Here
23	_cleanup()	23	_cleanup()
24		24
25	self._child_created = False	25	self._child_created = False
26	@@ -655,6 +661,7 @@	26	@@ -643,6 +649,7 @@ class Popen(object):
27	self.stderr = os.fdopen(errread, 'rU', bufsize)	27	self.stderr = os.fdopen(errread, 'rU', bufsize)
28	else:	28	else:
29	self.stderr = os.fdopen(errread, 'rb', bufsize)	29	self.stderr = os.fdopen(errread, 'rb', bufsize)