Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-85283: Build termios extension with the limited C API #116928

Merged
merged 1 commit into from
Mar 17, 2024

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Mar 17, 2024

@vstinner vstinner enabled auto-merge (squash) March 17, 2024 14:50
@vstinner vstinner merged commit 1cf0301 into python:main Mar 17, 2024
37 of 38 checks passed
@vstinner vstinner deleted the limited_termios branch March 17, 2024 15:12
@kulikjak
Copy link
Contributor

Hi! After this commit, I am seeing the following errors when building main on Solaris:

/..../cpython/Modules/termios.c:430:20: error: 'errno' undeclared (first use in this function)
  430 |     if (r == -1 && errno == EINVAL) {
      |                    ^~~~~
/..../cpython/Modules/termios.c:56:1: note: 'errno' is defined in header '<errno.h>'; did you forget to '#include <errno.h>'?
   55 | #include "clinic/termios.c.h"
  +++ |+#include <errno.h>

AFAICT, this is because of the newly added #define Py_LIMITED_API 0x030d0000, which "hides" the errno.h include in Python.h (same as the newly added string.h include). When I add the missing include, it compiles again.

Should I create a PR with a fix?

@vstinner
Copy link
Member Author

/..../cpython/Modules/termios.c:430:20: error: 'errno' undeclared (first use in this function)
  430 |     if (r == -1 && errno == EINVAL) {

That's strange. I cannot find this line in the main branch.

Do you have a patch on top of the main branch? If yes, you should consider to propose it upstream?

In main, I have:

    if (r == -1) {
        return PyErr_SetFromErrno(state->TermiosError);  // LINE 430
    }

@kulikjak
Copy link
Contributor

kulikjak commented Mar 19, 2024

Oh, I am very sorry. This is indeed from an internal patch and not in the termios.c sources...

It's a patch that workarounded an issue with the TIOCGWINSZ ioctl on Solaris, which is already fixed, and which I forgot to remove it (and since it was just a temporary workaround, I didn't upstream it).

@vstinner
Copy link
Member Author

It's a patch that workarounded an issue with the TIOCGWINSZ ioctl on Solaris, which I forgot to remove before (and since it was just a temporary workaround, I didn't upstream it).

Well, either remove it, or propose it upstream. If you keep it, just add <errno.h> include ;-)

vstinner added a commit to vstinner/cpython that referenced this pull request Mar 20, 2024
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants