Skip to content

libretro.mame2016: fix build with Make 4.3#101949

Merged
hrdinka merged 1 commit intoNixOS:masterfrom
AluisioASG:aasg/libretro-mame2016
Oct 29, 2020
Merged

libretro.mame2016: fix build with Make 4.3#101949
hrdinka merged 1 commit intoNixOS:masterfrom
AluisioASG:aasg/libretro-mame2016

Conversation

@AluisioASG
Copy link
Contributor

Motivation for this change

Builds currently fail with ar trying to operate on what are clearly two paths concatenated together. It stems from a backward-incompatible change in Make:

Previously appending using '+=' to an empty variable would result in a value starting with a space. Now the initial space is only added if the variable already contains some value. Similarly, appending an empty string does not add a trailing space.

This issue was first reported on mamedev/mame#6248, and affects libretro's 2016 snapshot as well. A fix that is reported to work with previous versions of Make was upstreamed to GENie, the build system, MAME, and now to libretro-mame2016 (pending), from which the patch comes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

If this gets backported to 20.09, libretro can then be unmarked as broken, as far as I can tell.

@AluisioASG AluisioASG requested review from MP2E, edwtjo and hrdinka October 28, 2020 16:21
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Oct 28, 2020
Builds currently fail with `ar` trying to operate on what are clearly
two paths concatenated together.  It stems from a backward-incompatible
change in Make:

> Previously appending using '+=' to an empty variable would result in
> a value starting with a space.  Now the initial space is only added
> if the variable already contains some value.  Similarly, appending an
> empty string does not add a trailing space.

This issue was first reported on the MAME repository proper
(mamedev/mame#6248), and affects libretro's
2016 snapshot as well.  A fix that is reported to work with previous
versions of Make was upstreamed to:
- GENie, the build system: bkaradzic/GENie#493
- MAME: mamedev/mame#6262
- libretro: libretro/mame2016-libretro#47

The fetched patch comes from the last of these.
@AluisioASG AluisioASG force-pushed the aasg/libretro-mame2016 branch from 5d1261d to 8880179 Compare October 28, 2020 16:32
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Oct 28, 2020

Result of nixpkgs-review pr 101949 1 run on x86_64-darwin

@GrahamcOfBorg Where is the one darwin package?

@hrdinka hrdinka merged commit 67b292a into NixOS:master Oct 29, 2020
@hrdinka
Copy link
Contributor

hrdinka commented Oct 29, 2020

Thanks a lot for the fix 👍

@AluisioASG AluisioASG deleted the aasg/libretro-mame2016 branch October 29, 2020 12:47
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants