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

phantomjs2: Fix compilation when using clang60 #74979

Merged
merged 1 commit into from Dec 5, 2019

Conversation

@lavoiesl
Copy link
Contributor

@lavoiesl lavoiesl commented Dec 4, 2019

Motivation for this change

Fixes:

webpage.cpp:80:89: error: invalid suffix on literal; C++11 requires a space between litend identifier [-Wreserved-user-defined-literal]

Fix taken from: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228223

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 nix-review --run "nix-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.
Notify maintainers

cc @volth
cc @lukeadams
cc @bkchr
cc @globin
cc @domenkozar

@lavoiesl lavoiesl force-pushed the Shopify:seb-phantomjs2-clang60 branch from cd33c39 to 8cf3890 Dec 4, 2019
@ofborg ofborg bot requested a review from aflatter Dec 4, 2019
@lavoiesl lavoiesl changed the title Fix phantomjs2 compilation when using clang60 phantomjs2: Fix compilation when using clang60 Dec 4, 2019
@veprbl
Copy link
Member

@veprbl veprbl commented Dec 4, 2019

We can just set NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal"; instead.

@lavoiesl lavoiesl force-pushed the Shopify:seb-phantomjs2-clang60 branch from 8cf3890 to 3dc5a20 Dec 5, 2019
@lavoiesl
Copy link
Contributor Author

@lavoiesl lavoiesl commented Dec 5, 2019

Oh yeah, much better 👍

@lavoiesl lavoiesl force-pushed the Shopify:seb-phantomjs2-clang60 branch from 3dc5a20 to 50915af Dec 5, 2019
@veprbl
Copy link
Member

@veprbl veprbl commented Dec 5, 2019

@GrahamcOfBorg build phantomjs2

@veprbl veprbl merged commit 31cf899 into NixOS:master Dec 5, 2019
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
phantomjs2 on aarch64-linux Success
Details
phantomjs2 on x86_64-darwin Success
Details
phantomjs2 on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.