From 80bde5b1af11ae40b4931f5960effff6f6ab44ba Mon Sep 17 00:00:00 2001 From: MastaG Date: Thu, 14 Mar 2019 11:12:37 +0100 Subject: Fix duplicates symbols when building with lld Samba: https://svnweb.freebsd.org/ports/branches/2018Q4/net/samba47/files/patch-source3__wscript_build?view=markup&pathrev=481551 Wayland: https://gitlab.freedesktop.org/wayland/wayland/commit/c70fd8a812d74b5ef6fcba1287b409f4f8821e91 --- .../wayland/files/fix_duplicate_main.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 recipes-graphics/wayland/files/fix_duplicate_main.patch (limited to 'recipes-graphics/wayland/files/fix_duplicate_main.patch') diff --git a/recipes-graphics/wayland/files/fix_duplicate_main.patch b/recipes-graphics/wayland/files/fix_duplicate_main.patch new file mode 100644 index 0000000..9b9ec99 --- /dev/null +++ b/recipes-graphics/wayland/files/fix_duplicate_main.patch @@ -0,0 +1,54 @@ +--- wayland-1.16.0/Makefile.am 2019-03-14 10:29:31.103099516 +0100 ++++ wayland-1.16.0/Makefile.am 2019-03-14 10:33:07.987977505 +0100 +@@ -210,12 +210,15 @@ + exec-fd-leak-checker \ + fixed-benchmark + +-noinst_LTLIBRARIES += libtest-runner.la ++noinst_LTLIBRARIES += \ ++ libtest-runner.la \ ++ libtest-helpers.la ++ ++libtest_helpers_la_SOURCES = tests/test-helpers.c + + libtest_runner_la_SOURCES = \ + tests/test-runner.c \ + tests/test-runner.h \ +- tests/test-helpers.c \ + tests/test-compositor.h \ + tests/test-compositor.c + libtest_runner_la_LIBADD = \ +@@ -223,9 +226,9 @@ + libwayland-util.la \ + libwayland-client.la \ + libwayland-server.la \ ++ libtest-helpers.la \ + -lrt -ldl $(FFI_LIBS) + +- + array_test_SOURCES = tests/array-test.c + array_test_LDADD = libtest-runner.la + client_test_SOURCES = tests/client-test.c +@@ -270,7 +273,6 @@ + headers_test_SOURCES = tests/headers-test.c \ + tests/headers-protocol-test.c \ + tests/headers-protocol-core-test.c +-headers_test_LDADD = libtest-runner.la + nodist_headers_test_SOURCES = \ + protocol/wayland-server-protocol-core.h \ + protocol/wayland-client-protocol-core.h +@@ -280,13 +282,12 @@ + endif + + fixed_benchmark_SOURCES = tests/fixed-benchmark.c +-fixed_benchmark_LDADD = libtest-runner.la + + os_wrappers_test_SOURCES = tests/os-wrappers-test.c + os_wrappers_test_LDADD = libtest-runner.la + + exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c +-exec_fd_leak_checker_LDADD = libtest-runner.la ++exec_fd_leak_checker_LDADD = libtest-helpers.la + + EXTRA_DIST += tests/scanner-test.sh \ + protocol/tests.xml \ -- cgit v1.2.3-54-g00ecf