Skip to content

libsidplayfp: pull fix for autoconf-2.72 pending upstream inclusion#276687

Merged
marsam merged 1 commit intoNixOS:masterfrom
trofi:libsidplayfp-autoconf-2.72
Dec 28, 2023
Merged

libsidplayfp: pull fix for autoconf-2.72 pending upstream inclusion#276687
marsam merged 1 commit intoNixOS:masterfrom
trofi:libsidplayfp-autoconf-2.72

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Dec 25, 2023

Without the change libsidplayfp fails the build on autoconf-2.72 as:

./configure: line 19606: syntax error near unexpected token `;;'
./configure: line 19606: ` ;;'

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Without the change `libsidplayfp` fails the build on `autoconf-2.72` as:

    ./configure: line 19606: syntax error near unexpected token `;;'
    ./configure: line 19606: ` ;;'
@trofi trofi mentioned this pull request Dec 25, 2023
13 tasks
@trofi
Copy link
Contributor Author

trofi commented Dec 25, 2023

Result of nixpkgs-review pr 276687 run on x86_64-linux 1

7 packages built:
  • audacious
  • audacious-plugins
  • gjay
  • libsidplayfp
  • libsidplayfp.doc
  • qmplay2
  • sidplayfp

@ofborg ofborg bot requested a review from OPNA2608 December 25, 2023 11:42
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 25, 2023
Copy link
Contributor

@OPNA2608 OPNA2608 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't run nixpkgs-review on current hardware, but checked building {,lib}sidplayfp on aarch64-linux.

  • Commit could potentially be changed to the now-merged libsidplayfp/libsidplayfp@2b1b41b, but doesn't really matter since they're the same.
  • The patch's name is potentially confusing, I would at least add a -compat.patch to it. More of a nit though, I potentially just care too much about that when I fetch patches.

Looks good-ish to me.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 25, 2023
@OPNA2608 OPNA2608 added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Dec 26, 2023
@marsam marsam merged commit 2b996bb into NixOS:master Dec 28, 2023
@trofi trofi deleted the libsidplayfp-autoconf-2.72 branch December 28, 2023 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants