commit 2f659f76903aec6595bc6f8dea18a6cd7bfdf465
Author: Jan Rękorajski <[email protected]>
Date: Wed Jan 30 14:43:06 2013 +0100
- fix linking with glibc 2.17
- rel 9
qemu-kvm-link.patch | 36 ++++++++++++++++++++++++++++++++++++
qemu-kvm.spec | 4 +++-
2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index b52d678..ac8c188 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -13,7 +13,7 @@ Summary: QEMU CPU Emulator
Summary(pl.UTF-8): QEMU - emulator procesora
Name: qemu-kvm
Version: 1.2.0
-Release: 8
+Release: 9
License: GPL v2+
Group: Applications/Emulators
Source0: http://downloads.sourceforge.net/kvm/%{name}-%{version}.tar.gz
@@ -39,6 +39,7 @@ Patch1: %{name}-fixes.patch
Patch2: qemu-cflags.patch
Patch3: qemu-usbredir.patch
Patch4: %{name}-system-libcacard.patch
+Patch5: %{name}-link.patch
URL: http://www.linux-kvm.org/
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
%{?with_sdl:BuildRequires: SDL-devel >= 1.2.1}
@@ -529,6 +530,7 @@ Ten pakiet nie musi być zainstalowany w systemie hosta.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%{__mv} libcacard libcacard-use-system-lib
diff --git a/qemu-kvm-link.patch b/qemu-kvm-link.patch
new file mode 100644
index 0000000..395b72b
--- /dev/null
+++ b/qemu-kvm-link.patch
@@ -0,0 +1,36 @@
+diff -ur qemu-kvm-1.2.0/Makefile qemu-kvm-1.2.0-link/Makefile
+--- qemu-kvm-1.2.0/Makefile 2013-01-30 14:17:35.513423335 +0100
++++ qemu-kvm-1.2.0-link/Makefile 2013-01-30 14:13:31.834592506 +0100
+@@ -136,8 +136,11 @@
+ iohandler.o cutils.o iov.o async.o
+ tools-obj-$(CONFIG_POSIX) += compatfd.o
+
++qemu-img$(EXESUF): LIBS += -lrt
+ qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
++qemu-nbd$(EXESUF): LIBS += -lrt
+ qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
++qemu-io$(EXESUF): LIBS += -lrt
+ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
+
+ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
+@@ -151,7 +151,7 @@
+ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
+ $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN
$@")
+
+-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
++qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lrt
+ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
+
+ gen-out-type = $(subst .,-,$(suffix $@))
+diff -ur qemu-kvm-1.2.0/Makefile.target qemu-kvm-1.2.0-link/Makefile.target
+--- qemu-kvm-1.2.0/Makefile.target 2012-09-06 10:31:27.000000000 +0200
++++ qemu-kvm-1.2.0-link/Makefile.target 2013-01-30 14:17:14.549903840
+0100
+@@ -8,6 +8,8 @@
+ include $(HWDIR)/config.mak
+ endif
+
++LIBS += -lrt
++
+ $(call set-vpath, $(SRC_PATH))
+ ifdef CONFIG_LINUX
+ QEMU_CFLAGS += -I../linux-headers
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qemu-kvm.git/commitdiff/2f659f76903aec6595bc6f8dea18a6cd7bfdf465
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
