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

meson: 0.51.2 → 0.52.1 #70650

Merged
merged 3 commits into from Dec 2, 2019
Merged

meson: 0.51.2 → 0.52.1 #70650

merged 3 commits into from Dec 2, 2019

Conversation

@jtojnar
Copy link
Contributor

jtojnar commented Oct 7, 2019

@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Oct 7, 2019

Hmm, not good:

[83/86] Linking target tests/client.eb@@client@exe/client.c.o'..[Ko'.K
FAILED: tests/client
/nix/store/7hzmz83nv8khpwsk858yaac7y3idh0a7-gcc-wrapper-8.3.0/bin/cc  -o tests/client 'tests/59830eb@@client@exe/client.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,--whole-archive -Wl,--start-group client/libdconf-client.a common/libdconf-common.a -Wl,--no-whole-archive tests/libdconf-mock.a engine/libdconf-engine.a gvdb/libgvdb.a shm/libdconf-shm.a gdbus/libdconf-gdbus-thread.a /nix/store/b94yb96v2b8n0clybv0iysd8xhl3bnz9-glib-2.60.7/lib/libgio-2.0.so /nix/store/b94yb96v2b8n0clybv0iysd8xhl3bnz9-glib-2.60.7/lib/libgobject-2.0.so /nix/store/b94yb96v2b8n0clybv0iysd8xhl3bnz9-glib-2.60.7/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/:$ORIGIN/../engine:$ORIGIN/../gvdb:$ORIGIN/../shm:/nix/store/b94yb96v2b8n0clybv0iysd8xhl3bnz9-glib-2.60.7/lib' -Wl,-rpath-link,/build/dconf-0.32.0/build/tests -Wl,-rpath-link,/nix/store/b94yb96v2b8n0clybv0iysd8xhl3bnz9-glib-2.60.7/lib -Wl,-rpath-link,/build/dconf-0.32.0/build/engine -Wl,-rpath-link,/build/dconf-0.32.0/build/gvdb -Wl,-rpath-link,/build/dconf-0.32.0/build/shm
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_new':
dconf-changeset.c:(.text+0x100): multiple definition of `dconf_changeset_new'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x100): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_new_database':
dconf-changeset.c:(.text+0x140): multiple definition of `dconf_changeset_new_database'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x140): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_unref':
dconf-changeset.c:(.text+0x240): multiple definition of `dconf_changeset_unref'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x240): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_ref':
dconf-changeset.c:(.text+0x2a0): multiple definition of `dconf_changeset_ref'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x2a0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_set':
dconf-changeset.c:(.text+0x2b0): multiple definition of `dconf_changeset_set'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x2b0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_get':
dconf-changeset.c:(.text+0x460): multiple definition of `dconf_changeset_get'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x460): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_is_similar_to':
dconf-changeset.c:(.text+0x550): multiple definition of `dconf_changeset_is_similar_to'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x550): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_all':
dconf-changeset.c:(.text+0x5f0): multiple definition of `dconf_changeset_all'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x5f0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_seal':
dconf-changeset.c:(.text+0x680): multiple definition of `dconf_changeset_seal'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x680): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_describe':
dconf-changeset.c:(.text+0x940): multiple definition of `dconf_changeset_describe'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x940): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_serialise':
dconf-changeset.c:(.text+0x9a0): multiple definition of `dconf_changeset_serialise'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0x9a0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_deserialise':
dconf-changeset.c:(.text+0xa60): multiple definition of `dconf_changeset_deserialise'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0xa60): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_new_write':
dconf-changeset.c:(.text+0xb60): multiple definition of `dconf_changeset_new_write'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0xb60): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_is_empty':
dconf-changeset.c:(.text+0xb90): multiple definition of `dconf_changeset_is_empty'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0xb90): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_change':
dconf-changeset.c:(.text+0xbb0): multiple definition of `dconf_changeset_change'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0xbb0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-changeset.c.o): in function `dconf_changeset_diff':
dconf-changeset.c:(.text+0xc60): multiple definition of `dconf_changeset_diff'; client/libdconf-client.a(dconf-changeset.c.o):dconf-changeset.c:(.text+0xc60): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-error.c.o): in function `dconf_error_quark':
dconf-error.c:(.text+0x0): multiple definition of `dconf_error_quark'; client/libdconf-client.a(dconf-error.c.o):dconf-error.c:(.text+0x0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_path':
dconf-paths.c:(.text+0x0): multiple definition of `dconf_is_path'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0x0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_key':
dconf-paths.c:(.text+0xb0): multiple definition of `dconf_is_key'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0xb0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_dir':
dconf-paths.c:(.text+0x180): multiple definition of `dconf_is_dir'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0x180): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_rel_path':
dconf-paths.c:(.text+0x250): multiple definition of `dconf_is_rel_path'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0x250): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_rel_key':
dconf-paths.c:(.text+0x2f0): multiple definition of `dconf_is_rel_key'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0x2f0): first defined here
/nix/store/cl1i6bfqnx48ipakj4px7pb1babzs23j-binutils-2.31.1/bin/ld: common/libdconf-common.a(dconf-paths.c.o): in function `dconf_is_rel_dir':
dconf-paths.c:(.text+0x3b0): multiple definition of `dconf_is_rel_dir'; client/libdconf-client.a(dconf-paths.c.o):dconf-paths.c:(.text+0x3b0): first defined here
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
builder for '/nix/store/xzgz5r0gvg4f53s9xh455r6c8xa6qj1q-dconf-0.32.0.drv' failed with exit code 1
@nh2

This comment has been minimized.

Copy link
Contributor

nh2 commented Nov 26, 2019

FYI @matthewbauer @dtzWill @Ericson2314

This release is important for static linking because as per https://mesonbuild.com/Release-notes-for-0-52-0.html

  • link_whole: of static libraries. In the example below, lib2 used to miss symbols from lib1 and was unusable.

I'm encountering this with gtk, where the gdk .a lacks gdk_x11 functions.

@jtojnar jtojnar force-pushed the jtojnar:meson-0.52 branch from 538f0d6 to 8ccbe6c Dec 1, 2019
@ofborg ofborg bot requested review from hedning and worldofpeace Dec 1, 2019
@jtojnar jtojnar changed the title meson: 0.51.2 → 0.52.0 meson: 0.51.2 → 0.52.1 Dec 1, 2019
@jtojnar jtojnar force-pushed the jtojnar:meson-0.52 branch from d91ee20 to cf73d1b Dec 1, 2019
@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Dec 1, 2019

Building a VM with with this now, let’s see if anything else breaks.

jtojnar added 2 commits Dec 1, 2019
@jtojnar jtojnar force-pushed the jtojnar:meson-0.52 branch from cf73d1b to cb7da09 Dec 1, 2019
@jtojnar

This comment has been minimized.

Copy link
Contributor Author

jtojnar commented Dec 2, 2019

Successfully ran GNOME Shell VM and some random Meson apps (gnome-control-center, nautilus, geary, gnome-photos, gnome-music, gedit, epihany, eog, gnome-software, gnome-maps, evince, cheese), and Pantheon VM (Videos, Settings, Code).

@jtojnar jtojnar moved this from WIP to Ready in Staging Dec 2, 2019
@jtojnar jtojnar merged commit 3a53ef0 into NixOS:staging Dec 2, 2019
13 checks passed
13 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
Staging automation moved this from Ready to Done Dec 2, 2019
@jtojnar jtojnar deleted the jtojnar:meson-0.52 branch Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

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