shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 18:03:50 +03:00
Code Releases Activity

storage: fix sheepdog driver / test linking to avoid duplicating source

Browse Source 
The libvirt_storage_backend_sheepdog_priv.la library depends on symbols
provided in the libvirt_driver_storage_impl.la library. As such the
latter must be listed 2nd when passed to the linker to avoid symbol
resolution problems. This mistake is being masked by the sheepdog
driver linking in a second copy of the storage driver code. Remove
this duplicate linkage of backend source and fix the test link order.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-02-26 17:54:12 +00:00
parent 19d3d2633c
commit e1ab81b339
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -1359,8 +1359,7 @@ libvirt_storage_backend_sheepdog_la_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)
libvirt_storage_backend_sheepdog_priv_la_SOURCES = \ libvirt_storage_backend_sheepdog_priv_la_SOURCES = \
$(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ $(STORAGE_DRIVER_SHEEPDOG_SOURCES)
$(STORAGE_DRIVER_BACKEND_SOURCES)
libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \ libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \
-I$(srcdir)/conf \ -I$(srcdir)/conf \
$(AM_CFLAGS) $(AM_CFLAGS)

2
tests/Makefile.am
View File

@ -842,8 +842,8 @@ storagebackendsheepdogtest_SOURCES = \
storagebackendsheepdogtest.c \ storagebackendsheepdogtest.c \
testutils.c testutils.h testutils.c testutils.h
storagebackendsheepdogtest_LDADD = \ storagebackendsheepdogtest_LDADD = \
../src/libvirt_driver_storage_impl.la \
../src/libvirt_storage_backend_sheepdog_priv.la \ ../src/libvirt_storage_backend_sheepdog_priv.la \
../src/libvirt_driver_storage_impl.la \
$(LDADDS) $(LDADDS)
else ! WITH_STORAGE_SHEEPDOG else ! WITH_STORAGE_SHEEPDOG
EXTRA_DIST += storagebackendsheepdogtest.c EXTRA_DIST += storagebackendsheepdogtest.c