Mercurial > vim
view src/osdef.sh @ 33583:123acdc8e64c v9.0.2036
patch 9.0.2036: if_python: rework python3.12 build dependency
Commit: https://github.com/vim/vim/commit/396058acd0cc66e5071d052e03d2067b134952af
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Tue Oct 17 10:38:11 2023 +0200
patch 9.0.2036: if_python: rework python3.12 build dependency
Problem: if_python: rework python3.12 build dependency
(after 9.0.1996)
Solution: use PyTuple_Size instead of inlining the Py_SIZE
into the Vim code base
Use a simpler fix for Python 3.12 build issues
Python 3.12 introduced link dependencies to their `Py_SIZE()` inline
function, which #13290 fixed by copying the inline function to Vim's
Python binding code. This works but it's fragile, as a future update may
change the implementation of `Py_SIZE` and there is no way for us to
know.
The reason we need `Py_SIZE` to begin with is that we use
`PyTuple_GET_SIZE()` which calls that. Just fix it by mapping that to
(confusingly similarly named) `PyTuple_Size()`, which we already do in
the stable ABI implementation. There's a minor performance cost in that
it's not inlined and it does error checking but that's fine as we only
call this function rarely (in an error handler).
related: #13290
closes: #13359
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 17 Oct 2023 10:45:04 +0200 |
parents | befdf44737d1 |
children |
line wrap: on
line source
#! /bin/sh # # osdef.sh -- copy osdef.h.in to osdef.h while removing declarations # found in the system header files. Caution: weird sed magic going on here. # Warnings are printed if sed did not survive. # # (C) Michael Schroeder, Juergen Weigert # # osdef.h.in has been split into osdef1.h.in and osdef2.h.in, because some # sed's could not handle the amount of commands (is 50 commands the limit?). # # 31.10.95 jw. if test -z "$CC"; then CC=cc fi if test -z "$srcdir"; then srcdir=. fi # Make sure collation works as expected # swedish range [a-z] does not match 'w' export LC_COLLATE=C export LC_ALL= rm -f core* *.core cat << EOF > osdef0.c #ifndef __APPLE__ # define select select_declared_wrong #endif #define tgetstr tgetstr_declared_wrong #include "auto/config.h" #include "os_unix.h" /* bring in most header files, more follow below */ #include "os_unixx.h" /* bring in header files for os_unix.c */ #ifdef HAVE_TERMCAP_H # include <termcap.h> /* only for term.c */ #endif #ifdef HAVE_FCNTL_H # include <fcntl.h> /* only used in a few files */ #endif #ifdef HAVE_SYS_STATFS_H # include <sys/types.h> # include <sys/statfs.h> /* only for memfile.c */ #endif #ifdef HAVE_X11 # include <X11/Intrinsic.h> #endif EOF $CC -I. -I$srcdir -E osdef0.c >osdef0.cc # insert a space in front of each line, so that a function name at the # start of the line is matched with "[)*, ]\1[ (]" sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\)(.*@/[)*, ][(]*\1[)]*[ (]/i\\\ \\/\\[^a-zA-Z_\\]\1(\\/d@p' > osdef11.sed sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\)(.*@/[)*, ][(]*\1[)]*[ (]/i\\\ \\/\\[^a-zA-Z_\\]\1(\\/d@p' > osdef21.sed cat << EOF > osdef2.sed 1i\\ /* 1i\\ * osdef.h is automagically created from osdef?.h.in by osdef.sh -- DO NOT EDIT 1i\\ */ EOF cat osdef0.ccc | sed -n -f osdef11.sed >> osdef2.sed sed -f osdef2.sed < $srcdir/osdef1.h.in > auto/osdef.h cat osdef0.ccc | sed -n -f osdef21.sed > osdef2.sed sed -f osdef2.sed < $srcdir/osdef2.h.in >> auto/osdef.h rm osdef0.c osdef0.cc osdef0.ccc osdef11.sed osdef21.sed osdef2.sed if test -f core*; then file core* echo " Sorry, your sed is broken. Call the system administrator." echo " Meanwhile, you may try to compile Vim with an empty osdef.h file." echo " If you compiler complains about missing prototypes, move the needed" echo " ones from osdef1.h.in and osdef2.h.in to osdef.h." exit 1 fi cat $srcdir/osdef1.h.in $srcdir/osdef2.h.in >osdefX.h.in if eval test "`diff auto/osdef.h osdefX.h.in | wc -l`" -eq 4; then echo " Hmm, sed is very pessimistic about your system header files." echo " But it did not dump core -- strange! Let's continue carefully..." echo " If this fails, you may want to remove offending lines from osdef.h" echo " or try with an empty osdef.h file, if your compiler can do without" echo " function declarations." fi rm osdefX.h.in