mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: fix main symbol duplication

Browse source 
So far I got these errors before patching:

libtool: link: cc -o .libs/headers-test -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/headers-test.o tests/headers-protocol-test.o tests/headers-protocol-core-test.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at headers-test.c:53 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/headers-test.c:53)
>>>            tests/headers-test.o:(main)
>>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>>            test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a

libtool: link: cc -o .libs/exec-fd-leak-checker -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/exec-fd-leak-checker.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at exec-fd-leak-checker.c:57 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/exec-fd-leak-checker.c:57)
>>>            tests/exec-fd-leak-checker.o:(main)
>>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>>            test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a

Makefile.am: error: object 'tests/test-helpers.$(OBJEXT)' created both with libtool and without

libtool: link: cc -o .libs/fixed-benchmark -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/fixed-benchmark.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib
ld: error: duplicate symbol: main
>>> defined at fixed-benchmark.c:100 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/fixed-benchmark.c:100)
>>>            tests/fixed-benchmark.o:(main)
>>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377)
>>>            test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a

This commit fixes all of that.

Signed-off-by: Leonid Bobrov <mazocomp@disroot.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Leonid Bobrov via wayland-devel 2019-02-13 13:39:06 +02:00 • committed by Pekka Paalanen
parent 8c121e1017
commit c70fd8a812
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile.am
View file

@ -210,12 +210,15 @@ noinst_PROGRAMS = \
exec-fd-leak-checker \ exec-fd-leak-checker \
fixed-benchmark 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 = \ libtest_runner_la_SOURCES = \
tests/test-runner.c \ tests/test-runner.c \
tests/test-runner.h \ tests/test-runner.h \
tests/test-helpers.c \
tests/test-compositor.h \ tests/test-compositor.h \
tests/test-compositor.c tests/test-compositor.c
libtest_runner_la_LIBADD = \ libtest_runner_la_LIBADD = \
@ -223,9 +226,9 @@ libtest_runner_la_LIBADD = \
libwayland-util.la \ libwayland-util.la \
libwayland-client.la \ libwayland-client.la \
libwayland-server.la \ libwayland-server.la \
libtest-helpers.la \
-lrt -ldl $(FFI_LIBS) -lrt -ldl $(FFI_LIBS)
array_test_SOURCES = tests/array-test.c array_test_SOURCES = tests/array-test.c
array_test_LDADD = libtest-runner.la array_test_LDADD = libtest-runner.la
client_test_SOURCES = tests/client-test.c client_test_SOURCES = tests/client-test.c
@ -270,7 +273,6 @@ protocol_logger_test_LDADD = libtest-runner.la
headers_test_SOURCES = tests/headers-test.c \ headers_test_SOURCES = tests/headers-test.c \
tests/headers-protocol-test.c \ tests/headers-protocol-test.c \
tests/headers-protocol-core-test.c tests/headers-protocol-core-test.c
headers_test_LDADD = libtest-runner.la
nodist_headers_test_SOURCES = \ nodist_headers_test_SOURCES = \
protocol/wayland-server-protocol-core.h \ protocol/wayland-server-protocol-core.h \
protocol/wayland-client-protocol-core.h protocol/wayland-client-protocol-core.h
@ -280,13 +282,12 @@ cpp_compile_test_SOURCES = tests/cpp-compile-test.cpp
endif endif
fixed_benchmark_SOURCES = tests/fixed-benchmark.c 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_SOURCES = tests/os-wrappers-test.c
os_wrappers_test_LDADD = libtest-runner.la os_wrappers_test_LDADD = libtest-runner.la
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c 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 \ EXTRA_DIST += tests/scanner-test.sh \
protocol/tests.xml \ protocol/tests.xml \