Skip to content

vendor: sync subprocess.h and drop local patches - #26808

Merged
ngxson merged 1 commit into
ggml-org:masterfrom
ServeurpersoCom:vendor/subprocess-upstream-sync
Aug 10, 2026
Merged

vendor: sync subprocess.h and drop local patches#26808
ngxson merged 1 commit into
ggml-org:masterfrom
ServeurpersoCom:vendor/subprocess-upstream-sync

Conversation

@ServeurpersoCom

Copy link
Copy Markdown
Contributor

Overview

The three patches applied locally in the previous vendor PR are now merged upstream, so this pins vendor/sheredom/subprocess.h to 9ce0d701 and drops the patch files together with the apply step in scripts/sync_vendor.py. The script is back to its pre patching shape, with only the pin bumped.

Additional information

The new pin also picks up three upstream fixes that were not part of the patch set: the -std=c++2a fallback for older compilers, the up front executable check on glibc older than 2.24 where posix_spawn cannot report an exec failure, and ENOSYS mapped to a dedicated subprocess_error_not_supported code. All additive, and nothing in llama.cpp reads subprocess_error_* or SUBPROCESS_HAVE_CWD.

Upstream references:

Checked locally: the vendored file is byte identical to the pinned raw URL, so check-vendor stays green, and llama-server rebuilds clean.

Follow-up #26606

Requirements

Upstream merged the Windows argument quoting fix, the NetBSD build
fix and the chdir fallback for glibc older than 2.29, so pin the
vendored copy to a commit that carries all three and remove the
patch files along with the apply step in the sync script.

The new pin also brings the exec error report on glibc older than
2.24 and the ENOSYS mapping to a dedicated error code. Both are
additive and no caller inspects those values.
@ngxson

ngxson commented Aug 9, 2026

Copy link
Copy Markdown
Collaborator

I'm re-running windows tests to see if that was a random fail: https://github.com/ggml-org/llama.cpp/actions/runs/31316672780/job/93289903504

@ngxson

ngxson commented Aug 9, 2026

Copy link
Copy Markdown
Collaborator

no idea if windows CI problem was related to this PR, can you double-check it @ServeurpersoCom ?

@ServeurpersoCom

ServeurpersoCom commented Aug 10, 2026

Copy link
Copy Markdown
Contributor Author

It's not from this PR, I'll make a small fix in a separate PR to correct master :

#26826 -> and I rebase all my PR (and this one) on top of this

Shame the hosted Windows runners are already nested one level deep, so no Linux containers there and no Docker coverage on Windows CI; Linux runners still cover it though.

@ngxson
ngxson merged commit 4c6766f into ggml-org:master Aug 10, 2026
27 of 32 checks passed
huaxel pushed a commit to huaxel/CachyLLama that referenced this pull request Aug 12, 2026
Upstream merged the Windows argument quoting fix, the NetBSD build
fix and the chdir fallback for glibc older than 2.29, so pin the
vendored copy to a commit that carries all three and remove the
patch files along with the apply step in the sync script.

The new pin also brings the exec error report on glibc older than
2.24 and the ENOSYS mapping to a dedicated error code. Both are
additive and no caller inspects those values.
brittlewis12 pushed a commit to brittlewis12/llama.cpp that referenced this pull request Aug 17, 2026
Upstream merged the Windows argument quoting fix, the NetBSD build
fix and the chdir fallback for glibc older than 2.29, so pin the
vendored copy to a commit that carries all three and remove the
patch files along with the apply step in the sync script.

The new pin also brings the exec error report on glibc older than
2.24 and the ENOSYS mapping to a dedicated error code. Both are
additive and no caller inspects those values.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants