incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1204287 - in /incubator/ooo/trunk/main/python: Python-linux3.patch makefile.mk
Date Sun, 20 Nov 2011 22:24:08 GMT
Author: arielch
Date: Sun Nov 20 22:24:08 2011
New Revision: 1204287

URL: http://svn.apache.org/viewvc?rev=1204287&view=rev
Log:
i118622 - python: build breaks on Linux with kernel 3.X

Added:
    incubator/ooo/trunk/main/python/Python-linux3.patch   (with props)
Modified:
    incubator/ooo/trunk/main/python/makefile.mk

Added: incubator/ooo/trunk/main/python/Python-linux3.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/Python-linux3.patch?rev=1204287&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/Python-linux3.patch (added)
+++ incubator/ooo/trunk/main/python/Python-linux3.patch Sun Nov 20 22:24:08 2011
@@ -0,0 +1,22 @@
+diff -uNrp misc/build/Python-2.6.1/configure misc/Python-2.6.1/configure
+--- misc/build/Python-2.6.1/configure	2008-11-16 15:57:10.000000000 -0200
++++ misc/Python-2.6.1/configure	2011-11-19 21:10:49.259397448 -0300
+@@ -2055,6 +2055,7 @@ then
+ 	MACHDEP="$ac_md_system$ac_md_release"
+ 
+ 	case $MACHDEP in
++    linux*) MACHDEP="linux2";;
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
+ 	atheos*) MACHDEP="atheos";;
+diff -uNrp misc/build/Python-2.6.1/configure.in misc/Python-2.6.1/configure.in
+--- misc/build/Python-2.6.1/configure.in	2008-11-16 06:02:56.000000000 -0200
++++ misc/Python-2.6.1/configure.in	2011-11-19 21:10:55.388397133 -0300
+@@ -229,6 +229,7 @@ then
+ 	MACHDEP="$ac_md_system$ac_md_release"
+ 
+ 	case $MACHDEP in
++    linux*) MACHDEP="linux2";;
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
+ 	atheos*) MACHDEP="atheos";;

Propchange: incubator/ooo/trunk/main/python/Python-linux3.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/trunk/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/makefile.mk?rev=1204287&r1=1204286&r2=1204287&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/makefile.mk (original)
+++ incubator/ooo/trunk/main/python/makefile.mk Sun Nov 20 22:24:08 2011
@@ -53,7 +53,8 @@ PATCH_FILES=\
 	Python-ssl.patch \
     Python-2.6.1-sysbase.patch\
 	Python-2.6.1-nohardlink.patch \
-	Python-disable-dbm.patch
+	Python-disable-dbm.patch \
+	Python-linux3.patch
 
 CONFIGURE_DIR=
 



Mime
View raw message