Mercurial > hgrepos > FreeBSD > ports > PyPy

annotate lang/pypy2/files/patch-rpython_rlib_clibffi.py @ 199:8b567a874360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to PyPy v7.3.19. BUGS: - pypy311 not yet supported. - pypy39 not yet deleted. - Tests for pypy3 not yet runnable.
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 12 Mar 2025 13:45:29 +0100
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
199
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
1 --- rpython/rlib/clibffi.py.orig 2025-02-22 16:54:09 UTC
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
2 +++ rpython/rlib/clibffi.py
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
3 @@ -77,11 +77,16 @@ if not _WIN32:
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
4 library_dirs = platform.library_dirs_for_libffi()
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
5 libraries = ['ffi']
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
6 link_files = []
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
7 - for libdir in library_dirs:
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
8 - candidate = os.path.join(libdir, "libffi.a")
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
9 - if os.path.exists(candidate):
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
10 - link_files.append(candidate)
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
11 - libraries = []
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
12 + #
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
13 + # fag: linking with libffi.a yields an error on FreeBSD because it is
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
14 + # not compiled with -fPIC: so link with libffi.so instead. This
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
15 + # is also true for previous versions of pypy.
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
16 + #
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
17 + # for libdir in library_dirs:
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
18 + # candidate = os.path.join(libdir, "libffi.a")
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
19 + # if os.path.exists(candidate):
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
20 + # link_files.append(candidate)
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
21 + # libraries = []
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
22
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
23 eci = ExternalCompilationInfo(
8b567a874360 Upgrade to PyPy v7.3.19.
Franz Glasner <fzglas.hg@dom66.de>
parents:
diff changeset
24 pre_include_bits = pre_include_bits,