python/py3cairo: Fixed build with Python 3.4.0.
Thanks to ml4711 who posted patches from LFS. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
a211de6abd
commit
afa449ab6e
|
@ -25,7 +25,7 @@
|
|||
PRGNAM=py3cairo
|
||||
SRCNAM=pycairo
|
||||
VERSION=${VERSION:-1.10.0}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -72,6 +72,13 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
patch -p1 < $CWD/pycairo-1.10.0-waf_unpack-1.patch
|
||||
wafdir=$(python3 ./waf unpack)
|
||||
pushd $wafdir
|
||||
patch -p1 < $CWD/pycairo-1.10.0-waf_python_3_4-1.patch
|
||||
popd
|
||||
unset wafdir
|
||||
|
||||
PYTHON="/usr/bin/python3" \
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au)
|
||||
Date: 2014-03-27
|
||||
Initial Package Version: 1.10.0
|
||||
Upstream Status: unknown
|
||||
Origin: Gentoo
|
||||
URL: https://bugs.gentoo.org/show_bug.cgi?id=504342
|
||||
Description: Fix build with Python-3.4
|
||||
|
||||
--- a/waflib/Tools/python.py
|
||||
+++ b/waflib/Tools/python.py
|
||||
@@ -169,7 +169,7 @@
|
||||
conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
|
||||
includes=[]
|
||||
if conf.env.PYTHON_CONFIG:
|
||||
- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
|
||||
+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
|
||||
if(incstr.startswith('-I')or incstr.startswith('/I')):
|
||||
incstr=incstr[2:]
|
||||
if incstr not in includes:
|
|
@ -0,0 +1,20 @@
|
|||
Submitted by: Wayne Blaszczyk (wblaszcz at bigpond dot net dot au)
|
||||
Date: 2014-03-27
|
||||
Initial Package Version: 1.10.0
|
||||
Upstream Status: unknown
|
||||
Origin: Gentoo
|
||||
URL: https://bugs.gentoo.org/show_bug.cgi?id=504342
|
||||
Description: Fix build with Python-3.4
|
||||
|
||||
--- a/waf
|
||||
+++ b/waf
|
||||
@@ -153,6 +153,9 @@
|
||||
return dir
|
||||
|
||||
wafdir = find_lib()
|
||||
+if sys.argv[1:] == ['unpack']:
|
||||
+ print(wafdir)
|
||||
+ exit()
|
||||
sys.path.insert(0, wafdir)
|
||||
from waflib.Tools.c_config import MACRO_TO_DESTOS
|
||||
MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
|
Loading…
Reference in New Issue