Author: baggins Date: Thu Feb 23 14:21:15 2012 GMT Module: packages Tag: HEAD ---- Log message: - removed dead code - fixed cflags passing
---- Files affected: packages/qemu: qemu.spec (1.194 -> 1.195) , qemu-cflags.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qemu/qemu.spec diff -u packages/qemu/qemu.spec:1.194 packages/qemu/qemu.spec:1.195 --- packages/qemu/qemu.spec:1.194 Thu Feb 23 15:18:37 2012 +++ packages/qemu/qemu.spec Thu Feb 23 15:21:09 2012 @@ -9,7 +9,6 @@ # qemu-0.11.1-*.x86_64.rpm - OK # # Conditional build: -%bcond_with cflags_passing # with passing rpmcflags to Makefiles %bcond_with nosdlgui # do not use SDL gui (use X11 instead) Summary: QEMU CPU Emulator @@ -21,6 +20,7 @@ Group: Applications/Emulators Source0: http://wiki.qemu.org/download/%{name}-%{version}.tar.gz # Source0-md5: a64b36067a191451323b0d34ebb44954 +Patch0: qemu-cflags.patch Patch6: %{name}-nosdlgui.patch # Proof of concept, for reference, do not remove Patch8: %{name}-kde_virtual_workspaces_hack.patch @@ -270,27 +270,18 @@ %prep %setup -q +%patch0 -p1 %{?with_nosdlgui:%patch6 -p1} #patch8 -p1 %patch17 -p0 -%{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure -%{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile - -# cannot use optflags on x86 - they cause "no register to spill" errors -%if %{with cflags_passing} -%{__sed} -i -e 's/-g $CFLAGS/-Wall %{rpmcflags}/' configure -%else -%{__sed} -i 's/-g $CFLAGS/-Wall -fno-var-tracking-assignments/' configure -%endif - # workaround for conflict with alsa/error.h ln -s ../error.h qapi/error.h %build -# --extra-cflags don't work (overridden by CFLAGS in Makefile*) -# they can be passed if the cflags_passing bcond is used ./configure \ + --extra-cflags="%{rpmcflags} -I/usr/include/ncurses" \ + --extra-ldflags="%{rpmldflags}" \ --sysconfdir=%{_sysconfdir} \ --prefix=%{_prefix} \ --cc="%{__cc}" \ @@ -440,6 +431,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.195 2012/02/23 14:21:09 baggins +- removed dead code +- fixed cflags passing + Revision 1.194 2012/02/23 14:18:37 baggins - rel 8 - removed obsolete/outdated patches ================================================================ Index: packages/qemu/qemu-cflags.patch diff -u /dev/null packages/qemu/qemu-cflags.patch:1.1 --- /dev/null Thu Feb 23 15:21:15 2012 +++ packages/qemu/qemu-cflags.patch Thu Feb 23 15:21:09 2012 @@ -0,0 +1,13 @@ +--- qemu-kvm-1.0/configure~ 2012-02-22 11:45:58.440892282 +0100 ++++ qemu-kvm-1.0/configure 2012-02-23 10:24:12.692463270 +0100 +@@ -2781,10 +2781,6 @@ + # End of CC checks + # After here, no more $cc or $ld runs + +-if test "$debug" = "no" ; then +- CFLAGS="-O2 $CFLAGS" +-fi +- + # Consult white-list to determine whether to enable werror + # by default. Only enable by default for git builds + z_version=`cut -f3 -d. $source_path/VERSION` ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qemu/qemu.spec?r1=1.194&r2=1.195&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
