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

php: 7.2.8 -> 7.2.10, 7.1.21 -> 7.1.22 #46694

Merged
merged 2 commits into from Sep 15, 2018
Merged

Conversation

etu
Copy link
Contributor

@etu etu commented Sep 15, 2018

Motivation for this change

This should not be backported due to flag changes due to upstream bugs.

Changelog 7.2.9: http://php.net/ChangeLog-7.php#7.2.9
Changelog 7.2.10: http://php.net/ChangeLog-7.php#7.2.10
Changelog 7.1.22: http://php.net/ChangeLog-7.php#7.1.22

If someone could trigger a borg build for darwin as well it would be great since 7.2.9 seemed to fail on darwin in the 7.2.9 PR that never got merged due to darwin failure #45159.

This fixes #45159.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

cc @xeji @globin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/lib/build/config.guess: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/lib/build/shtool: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/lib/build/config.sub: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10...
moving /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/sbin/* to /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev
checking for references to /build in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev...
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10/bin/pear: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10/bin/php-config: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10/bin/phpize: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10...
moving /nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10/sbin/* to /nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/r9pcvyfp4w7vlrngx9ws36zcxzvwsmmj-php-7.2.10-dev
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/r9pcvyfp4w7vlrngx9ws36zcxzvwsmmj-php-7.2.10-dev
checking for references to /build in /nix/store/r9pcvyfp4w7vlrngx9ws36zcxzvwsmmj-php-7.2.10-dev...
/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018 via email

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/bin/pear: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/bin/phpize: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/bin/php-config: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10...
moving /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/sbin/* to /nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10/bin
shrinking RPATHs of ELF executables and libraries in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev
checking for references to /build in /nix/store/pbv2l8bi0p1ag97nj7g00npypf909pvj-php-7.2.10-dev...
/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: php

Partial log (click to expand)

/private/tmp/nix-build-php-7.2.10.drv-0/php-7.2.10/main/php_config.h:2619:24: note: expanded from macro 'zend_finite'
#define zend_finite(a) finite(a)
                       ^
/nix/store/qjmqrzk8nhn5maa093fhl3finczz72lw-libc++-5.0.2/include/c++/v1/math.h:439:1: note: 'isfinite' declared here
isfinite(_A1 __lcpp_x) _NOEXCEPT
^
2 errors generated.
make: *** [Makefile:1177: ext/intl/intl_convertcpp.lo] Error 1
builder for '/nix/store/ri5jbl1a9msphjy1fq419wb1v7ifar86-php-7.2.10.drv' failed with exit code 2
error: build of '/nix/store/ri5jbl1a9msphjy1fq419wb1v7ifar86-php-7.2.10.drv' failed

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

Unfortunately the same darwin error as in #45159

@xeji xeji mentioned this pull request Sep 15, 2018
@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

There's an upstream bug: https://bugs.php.net/bug.php?id=76826 . Apparently this is about the intl extension. Maybe we can disable it on Darwin until this bug is fixed?

Let's try intlSupport ? (config.php.intl or true) and !stdenv.isDarwin

@xeji xeji mentioned this pull request Sep 15, 2018
9 tasks
@etu
Copy link
Contributor Author

etu commented Sep 15, 2018

@xeji We could do that workaround for unstable, but I'm not comfortable with changing the flags for stable. But I'll update my this PR and not the other (#46697) , but both will be fixed whenever merged.

@etu
Copy link
Contributor Author

etu commented Sep 15, 2018

@xeji I have pushed an update of my commit with a change of intl, please trigger the darwin build (I don't have any darwin systems to test on anyways).

But I don't think that we should backport this to stable until the upstream issue is fixed.

@etu etu changed the title php: 7.2.8 -> 7.2.10 php: 7.2.8 -> 7.2.10, 7.1.21 -> 7.1.22 Sep 15, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php, php71

Partial log (click to expand)

/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10
/nix/store/fsy37l7pf4n8cpxdxz3bwgqmcb5m9j8s-php-7.1.22

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php, php71

Partial log (click to expand)

/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10
/nix/store/fh2rz2r4zzyw4waki8iy4ymzsg3ilb0r-php-7.1.22

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php

Partial log (click to expand)

/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

@GrahamcOfBorg build php php71

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: php, php71

Partial log (click to expand)

/nix/store/rn16hz5rzy5rniknwkqnlxykljfmbv18-php-7.2.10
/nix/store/fh2rz2r4zzyw4waki8iy4ymzsg3ilb0r-php-7.1.22

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: php, php71

Partial log (click to expand)

/nix/store/ax4ld5rmnagcff08srgxbjpsb75vsmf4-php-7.2.10
/nix/store/fsy37l7pf4n8cpxdxz3bwgqmcb5m9j8s-php-7.1.22

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: php, php71

Partial log (click to expand)

/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/bin/php-config: interpreter directive changed from " /bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/bin/phpize: interpreter directive changed from "/bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/lib/build/config.guess: interpreter directive changed from " /bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/lib/build/config.sub: interpreter directive changed from " /bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/lib/build/shtool: interpreter directive changed from "/bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
moving /nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/sbin/* to /nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10/bin
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/j4v6dmdf9r0nl7gmb16zlfjnmgxsgqwm-php-7.2.10-dev
/nix/store/fpyqp40skdiv31b1d4h7rkj67x3f404f-php-7.2.10
/nix/store/q6y881ygjbgmdkkqj8yw92n24lmnkszv-php-7.1.22

@xeji xeji merged commit d3d465e into NixOS:master Sep 15, 2018
@etu etu deleted the upgrade-php-7210 branch September 15, 2018 21:31
@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

@etu let's not backport this to 18.09 for now but wait until upstream fixes the darwin bug. We can reconsider if they don't fix it soon.

@etu
Copy link
Contributor Author

etu commented Sep 15, 2018

@xeji Yeah, I agree. I will keep track of the upstream issue and try to restore the defaults whever the next release happens 👍

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants