diff --git a/pypy3.spec b/pypy3.spec index 0ab7125..70caacc 100644 --- a/pypy3.spec +++ b/pypy3.spec @@ -179,25 +179,15 @@ Source189: 189-use-rpm-wheels.patch # and avoid a cycle in the build-time dependency graph: # Note, pypy3 is built with pypy2, so no dependency cycle -%ifarch %{power64} -# the build is unreliable with pypy+power, getting random failures -# so better have a bit slower build than having to build until it pass -%global use_self_when_building 0 -%else %global use_self_when_building 1 -%endif - %if 0%{use_self_when_building} # pypy3 can only be build with pypy2 BuildRequires: pypy2 -# no pypy-pycparser available ATM %global bootstrap_python_interp pypy2 %else - - # pypy3 can only be build with python2 -BuildRequires: python2-devel -BuildRequires: python2-pycparser +# exception to use Python 2: https://pagure.io/fesco/issue/2130 +BuildRequires: python27 %global bootstrap_python_interp python2 %endif @@ -356,6 +346,11 @@ rm lib-python/3/idlelib/idle.bat sed -i -r 's/\$\(LDFLAGSEXTRA\)/& -fuse-ld=gold/' ./rpython/translator/platform/posix.py %endif +%if ! 0%{use_self_when_building} + # use the pycparser from PyPy even on CPython + ln -s lib_pypy/cffi/_pycparser pycparser +%endif + %build %ifarch s390 s390x # pypy3 requires z10 at least