Skip to content

Comments

[Backport staging-23.05] http-parser: fix copying outputs for static build#271202

Merged
Ericson2314 merged 2 commits intostaging-23.05from
backport-254516-to-staging-23.05
Dec 1, 2023
Merged

[Backport staging-23.05] http-parser: fix copying outputs for static build#271202
Ericson2314 merged 2 commits intostaging-23.05from
backport-254516-to-staging-23.05

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Nov 30, 2023

Bot-based backport to staging-23.05, triggered by a label in #254516.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

@github-actions github-actions bot mentioned this pull request Nov 30, 2023
Merged
12 tasks
Ericson2314 and others added 2 commits November 30, 2023 09:39
@Ericson2314
http-parser: Delete unused patch
e31f052 
Since 4056c43 a Make not Gyp build
system has been in use.

(cherry picked from commit fa58b67)
@Strum355 @Ericson2314
http_parser: fix copying outputs for static build
36c4ac0 
Co-Authored-By: John Ericson <[email protected]>
(cherry picked from commit 33f464b)
@Ericson2314 Ericson2314 force-pushed the backport-254516-to-staging-23.05 branch from 3d81e83 to 36c4ac0 Compare November 30, 2023 14:39
@Ericson2314 Ericson2314 mentioned this pull request Nov 30, 2023
Closed
@ofborg ofborg bot requested a review from matthewbauer November 30, 2023 21:03
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 30, 2023
@Ericson2314 Ericson2314 merged commit bf7f709 into staging-23.05 Dec 1, 2023
@Ericson2314 Ericson2314 deleted the backport-254516-to-staging-23.05 branch December 1, 2023 12:59
Ericson2314 added a commit to NixOS/nix that referenced this pull request Dec 1, 2023
@Ericson2314
flake.lock: Update Nixpkgs to fix static build
7355a48 
The problem was since switching to use libgit2, we had a package in our
closure (`http-parser`) that was always trying to build as a shared
object.

Underlying Nixpkgs PR (a 23.05 backport)
NixOS/nixpkgs#271202

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9ba29e2346bc542e9909d1021e8fd7d4b3f64db0' (2023-11-13)
  → 'github:NixOS/nixpkgs/36c4ac09e9bebcec1fa7b7539cddb0c9e837409c' (2023-11-30)
@Ericson2314 Ericson2314 mentioned this pull request Dec 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Ericson2314 @Strum355