From bdcf476c10805c92fcaf42e42bf024328ac31677 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 8 Aug 2016 10:33:21 +0800 Subject: libvirt: fix build error for arm When build for architecture that don't use gcc atomic ops but pthread, it fails to build for arm: | ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virClassNew': | /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:153: undefined reference to `virAtomicLock' | ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectNew': | /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:205: undefined reference to `virAtomicLock' | ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectUnref': | /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:277: undefined reference to `virAtomicLock' | ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectRef': | /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:298: undefined reference to `virAtomicLock' | collect2: error: ld returned 1 exit status It is similar with: http://libvirt.org/git/?p=libvirt.git;a=commit;h=12dc729 Signed-off-by: Kai Kang Signed-off-by: Bruce Ashfield --- .../0001-nsslinktest-also-build-virAtomic.h.patch | 40 ++++++++++++++++++++++ recipes-extended/libvirt/libvirt_1.3.5.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch (limited to 'recipes-extended') diff --git a/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch b/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch new file mode 100644 index 00000000..6ab1c4e5 --- /dev/null +++ b/recipes-extended/libvirt/libvirt/0001-nsslinktest-also-build-virAtomic.h.patch @@ -0,0 +1,40 @@ +Upstream-Status: Submitted [http://www.redhat.com/archives/libvir-list/2016-August/msg00389.html] + +When build for architecture that don't use gcc atomic ops but pthread, +it fails to build for arm: + +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virClassNew': +| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:153: undefined reference to `virAtomicLock' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectNew': +| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:205: undefined reference to `virAtomicLock' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectUnref': +| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:277: undefined reference to `virAtomicLock' +| ../tools/nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virobject.o): In function `virObjectRef': +| /buildarea2/kkang/builds/qemuarm-Aug03/bitbake_build/tmp/work/armv5e-wrs-linux-gnueabi/libvirt/1.3.5-r0/build/src/../../libvirt-1.3.5/src/util/virobject.c:298: undefined reference to `virAtomicLock' +| collect2: error: ld returned 1 exit status + +It is similar with: + +http://libvirt.org/git/?p=libvirt.git;a=commit;h=12dc729 + +Signed-off-by: Kai Kang +--- + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 12b66c2..6e55972 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2989,6 +2989,8 @@ noinst_LTLIBRARIES += libvirt-nss.la + libvirt_nss_la_SOURCES = \ + util/viralloc.c \ + util/viralloc.h \ ++ util/viratomic.c \ ++ util/viratomic.h \ + util/virbitmap.c \ + util/virbitmap.h \ + util/virbuffer.c \ +-- +2.9.0 + diff --git a/recipes-extended/libvirt/libvirt_1.3.5.bb b/recipes-extended/libvirt/libvirt_1.3.5.bb index f4a8f387..7ff2c5f6 100644 --- a/recipes-extended/libvirt/libvirt_1.3.5.bb +++ b/recipes-extended/libvirt/libvirt_1.3.5.bb @@ -33,6 +33,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \ file://0001-to-fix-build-error.patch \ file://Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch \ file://install-missing-file.patch \ + file://0001-nsslinktest-also-build-virAtomic.h.patch \ " SRC_URI[libvirt.md5sum] = "f9dc1e63d559eca50ae0ee798a4c6c6d" -- cgit v1.2.3-54-g00ecf