Attachment 1859666 Details for Bug 1529001 – arrange lib64 and include files closer to those of python3.9

[patch] arrange lib64 and include files closer to those of python3.9

pypy3.9-locations.patch (text/plain), 4.60 KB, created by Ling Li on 2022-02-07 22:11:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ling Li

Created: 2022-02-07 22:11:27 UTC

Size: 4.60 KB

patch

obsolete

>diff --git a/pypy3.9.spec b/pypy3.9.spec
>index b4ec7e4..5c09b15 100644
>--- a/pypy3.9.spec
>+++ b/pypy3.9.spec
>@@ -208,7 +208,7 @@ BuildRequires:  openssl-devel
> BuildRequires:  gdbm-devel
> BuildRequires:  xz-devel
> 
>-BuildRequires:  python-rpm-macros
>+BuildRequires:  python%{python3_pkgversion}-rpm-macros
> 
> %ifnarch s390
> BuildRequires:  valgrind-devel
>@@ -237,8 +237,8 @@ BuildRequires:  emacs
> BuildRequires:  %{_bindir}/git
> 
> %if %{with rpmwheels}
>-BuildRequires: python-setuptools-wheel
>-BuildRequires: python-pip-wheel
>+BuildRequires: python%{python3_pkgversion}-setuptools-wheel
>+BuildRequires: python%{python3_pkgversion}-pip-wheel
> %endif
> 
> # Metadata for the core package (the JIT build):
>@@ -282,8 +282,8 @@ Obsoletes: pypy3-libs < 7.3.4-4
> %endif
> 
> %if %{with rpmwheels}
>-Requires: python-setuptools-wheel
>-Requires: python-pip-wheel
>+Requires: python%{python3_pkgversion}-setuptools-wheel
>+Requires: python%{python3_pkgversion}-pip-wheel
> %else
> Provides: bundled(python3dist(pip)) = 21.2.4
> Provides: bundled(python3dist(setuptools)) = 58.1.0
>@@ -468,7 +468,7 @@ BuildPyPy() {
>   # The generated C code leads to many thousands of warnings of the form:
>   #   warning: variable 'l_v26003' set but not used [-Wunused-but-set-variable]
>   # Suppress them:
>-  export CFLAGS=$(echo "$CFLAGS" -Wno-unused -fPIC)
>+  export CFLAGS=$(echo "$CFLAGS" -Wno-unused -fPIC -fno-semantic-interposition)
> 
>   # If we're already built the JIT-enabled "pypy", then use it for subsequent
>   # builds (of other configurations):
>@@ -519,11 +519,12 @@ BuildPyPy \
> 
> %install
> mkdir -p %{buildroot}/%{_bindir}
>-mkdir -p %{buildroot}/%{pypyprefix}
> 
> 
>-# Run installing script,  archive-name  pypy%{pyversion} in %{buildroot}/%{_libdir} == %{pypyprefix}
>-%{bootstrap_python_interp} pypy/tool/release/package.py --archive-name pypy%{pyversion} --builddir %{buildroot}/%{_libdir} --no-embedded-dependencies
>+# Run installing script,  <archive-name>/<platlibdir> in %{buildroot} == %{pypyprefix}
>+%{bootstrap_python_interp} pypy/tool/release/package.py --archive-name usr --builddir %{buildroot} --no-embedded-dependencies
>+mv %{buildroot}/usr/{bin,LICENSE} %{buildroot}%{pypyprefix}/
>+mkdir -p %{buildroot}%{_bindir}
> 
> 
> # Remove shebang lines from .py files that aren't executable, and
>@@ -542,7 +543,8 @@ find \
>         \)                                                               \
>     \)
> 
>-mkdir -p %{buildroot}/%{pypyprefix}/site-packages
>+mkdir -p %{buildroot}%{pypyprefix}/site-packages/__pycache__
>+mkdir -p %{buildroot}/usr/lib/pypy%{pyversion}/site-packages/__pycache__
> 
> # The generated machine code doesn't need an executable stack,  but
> # one of the assembler files (gcmaptable.s) doesn't have the necessary
>@@ -631,7 +633,7 @@ ln -s pypy%{pyversion} %{buildroot}%{_bindir}/pypy3
> # FIXME: arguably these should be instead put into a subdir below /usr/include,
> # it's not yet clear to me how upstream plan to deal with the C extension
> # interface going forward, so let's just mimic upstream for now.
>-%global pypy_include_dir  %{pypyprefix}/include
>+%global pypy_include_dir %{_includedir}
> mkdir -p %{buildroot}%{pypy_include_dir}
> rm -f %{buildroot}%{pypy_include_dir}/README
> 
>@@ -693,8 +695,8 @@ install -m0644 -p -D -t %{buildroot}/%{_rpmconfigdir}/macros.d %{SOURCE2}
> %endif
> 
> # Remove files we don't want:
>-rm -f %{buildroot}%{_libdir}/%{name}.tar.bz2 \
>-   %{buildroot}%{pypyprefix}/README.rst
>+rm -f %{buildroot}/*.tar.bz2 \
>+   %{buildroot}/usr/README.rst
> 
> # wtf? This is probably masking some bigger problem, but let's do this for now
> mv -v lib-python/3/test/regrtest.py-new lib-python/3/test/regrtest.py || :
>@@ -843,13 +845,13 @@ CheckPyPy pypy%{pyversion}-c
> %files libs
> %doc README.rst
> 
>-%dir %{pypyprefix}
> %license %{pypyprefix}/LICENSE
>-%license %{pypyprefix}/%{_lib}/pypy%{pyversion}/_cffi_ssl/LICENSE
>-%license %{pypyprefix}/%{_lib}/pypy%{pyversion}/cffi/_pycparser/ply/LICENSE
>-%license %{pypyprefix}/%{_lib}/pypy%{pyversion}/hpy.dist-info/LICENSE
>-%{pypyprefix}/%{_lib}/pypy%{pyversion}/
>-%{pypyprefix}/site-packages/
>+%license %{pypyprefix}/_cffi_ssl/LICENSE
>+%license %{pypyprefix}/cffi/_pycparser/ply/LICENSE
>+%license %{pypyprefix}/hpy.dist-info/LICENSE
>+%{pypyprefix}/
>+%exclude %{pypyprefix}/bin/
>+/usr/lib/pypy%{pyversion}/
> %if %{with_emacs}
> %{_emacs_sitelispdir}/pypy%{pyversion}trace-mode.el
> %{_emacs_sitelispdir}/pypy%{pyversion}trace-mode.elc
>@@ -864,9 +866,7 @@ CheckPyPy pypy%{pyversion}-c
> %{pypyprefix}/bin/
> 
> %files devel
>-%dir %{pypy_include_dir}
>-%dir %{pypy_include_dir}/pypy%{pyversion}
>-%{pypy_include_dir}/pypy%{pyversion}/*.h
>+%{pypy_include_dir}/pypy%{pyversion}
> %if %{with main_pypy3}
> %{_rpmconfigdir}/macros.d/macros.pypy3
> %endif

Actions: View | Diff

Attachments on bug 1529001: 1859666