diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2006-08-17 07:37:25 +0000 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2006-08-17 07:37:25 +0000 |
commit | c61bae625c8e349574a6c669851f942d65813f2f (patch) | |
tree | 1198870fe66645c203fcb91c201bb3b3e4b929d7 /app-emulation/qemu-softmmu | |
parent | version bump thanks to Tristan Heaven <tristanheaven@gmail.com>, Tamer Fahmy ... (diff) | |
download | gentoo-2-c61bae625c8e349574a6c669851f942d65813f2f.tar.gz gentoo-2-c61bae625c8e349574a6c669851f942d65813f2f.tar.bz2 gentoo-2-c61bae625c8e349574a6c669851f942d65813f2f.zip |
add alsa, adlib and tc-getCC support, fix kqemu deps, see bug #116599, bug #132602, bug #141721
(Portage version: 2.1.1_pre5-r1)
Diffstat (limited to 'app-emulation/qemu-softmmu')
5 files changed, 135 insertions, 9 deletions
diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog index 77f48251160f..b199edb04e42 100644 --- a/app-emulation/qemu-softmmu/ChangeLog +++ b/app-emulation/qemu-softmmu/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-emulation/qemu-softmmu # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.23 2006/08/01 19:09:16 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.24 2006/08/17 07:37:25 lu_zero Exp $ + +*qemu-softmmu-0.8.2-r1 (17 Aug 2006) + + 17 Aug 2006; Luca Barbato <lu_zero@gentoo.org> + qemu-softmmu-0.8.2-r1.ebuild, files/digest-qemu-softmmu-0.8.2-r1: + Added alsa support as requested in bug #116599 by Ivan Yosifov <ivan@yosifov.net> + and adlib support as requested by Jan Simons <gentoo@onkos.de> on the same bug; + use tc-getCC, patch from Damien THEBAULT <damien.thebault@laposte.net> in + bug #132602, set correct kqemu deps, should solve bug #141721 01 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild: False hope, gcc-3 is still required. diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 index e882cdf637e4..f4e0a49eb203 100644 --- a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 +++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 @@ -1,6 +1,6 @@ -MD5 02cfdecda90458d6393781496ec6b48b kqemu-0.7.2.tar.gz 79314 -RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 kqemu-0.7.2.tar.gz 79314 -SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b kqemu-0.7.2.tar.gz 79314 +MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920 +RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920 +SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920 MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909 RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909 SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909 diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1 new file mode 100644 index 000000000000..f4e0a49eb203 --- /dev/null +++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1 @@ -0,0 +1,6 @@ +MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920 +RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920 +SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920 +MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909 +RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909 +SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909 diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild new file mode 100644 index 000000000000..b22542d17505 --- /dev/null +++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild,v 1.1 2006/08/17 07:37:25 lu_zero Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator" +HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" +SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz + kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )" + +LICENSE="GPL-2 LGPL-2.1 KQEMU" +SLOT="0" +KEYWORDS="-alpha ~amd64 ~ppc -sparc ~x86" +IUSE="sdl kqemu alsa" #qvm86 debug nptl qemu-fast nptlonly" +RESTRICT="nostrip test" + +DEPEND="virtual/libc + sdl? ( media-libs/libsdl ) + alsa? ( media-libs/alsa-lib ) + !<=app-emulation/qemu-0.7.0 + kqemu? ( >=app-emulation/kqemu-1.3.0_pre7 ) + app-text/texi2html" +RDEPEND="sdl? ( media-libs/libsdl )" + +S="${WORKDIR}/${P/-softmmu/}" + +set_target_list() { + TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu" + export TARGET_LIST +} + +pkg_setup() { + if [ "$(gcc-major-version)" == "4" ]; then + eerror "qemu requires gcc-3 in order to build and work correctly" + eerror "please compile it with gcc-3" + die "gcc 4 cannot build qemu" + fi +} + +#RUNTIME_PATH="/emul/gnemul/" +src_unpack() { + unpack ${A} + if use kqemu; then + mv ${WORKDIR}/kqemu ${S} + cd ${S}/kqemu + #Let the configure find kqemu but NOT build it + sed -i -e 's:$(MAKE) -C kqemu*::' ${S}/Makefile + fi + + cd ${S} + epatch "${FILESDIR}/qemu-${PV}-sparc-fp.patch" + # Alter target makefiles to accept CFLAGS set via flag-o. + sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target tests/Makefile + # Ensure mprotect restrictions are relaxed for emulator binaries + [[ -x /sbin/paxctl ]] && \ + sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \ + Makefile.target + # Prevent install of kernel module by qemu's makefile + sed -i 's/\(.\/install.sh\)/#\1/' Makefile +} + +src_compile() { + #Let the application set its cflags + unset CFLAGS + + # Switch off hardened tech + filter-flags -fpie -fstack-protector + + set_target_list + + myconf="--disable-gcc-check" + if ! use sdl ; then + myconf="$myconf --disable-gfx-check" + fi + ./configure \ + --prefix=/usr \ + --target-list="${TARGET_LIST}" \ + --enable-slirp --enable-adlib \ + --cc=$(tc-getCC) \ + --host-cc=$(tc-getCC) \ + --kernel-path=${KV_DIR} \ + $(use_enable sdl)\ + $(use_enable kqemu) \ + $(use_enable alsa) \ + ${myconf} \ + || die "could not configure" + + emake || die "make failed" +} + +src_install() { + make install \ + prefix=${D}/usr \ + bindir=${D}/usr/bin \ + datadir=${D}/usr/share/qemu \ + docdir=${D}/usr/share/doc/${P} \ + mandir=${D}/usr/share/man || die + + chmod -x ${D}/usr/share/man/*/* +} + +pkg_postinst() { + einfo "You will need the Universal TUN/TAP driver compiled into" + einfo "kernel or as a module to use the virtual network device." +} diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild index e6e07cc74ab2..9a27a9d7f70b 100644 --- a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild +++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild,v 1.2 2006/08/01 19:09:16 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild,v 1.3 2006/08/17 07:37:25 lu_zero Exp $ inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator" HOMEPAGE="http://fabrice.bellard.free.fr/qemu/" SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz - kqemu? ( ${HOMEPAGE}kqemu-0.7.2.tar.gz )" + kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )" LICENSE="GPL-2 LGPL-2.1 KQEMU" SLOT="0" @@ -17,6 +17,7 @@ RESTRICT="nostrip test" DEPEND="virtual/libc sdl? ( media-libs/libsdl ) + alsa? ( media-libs/alsa-lib ) !<=app-emulation/qemu-0.7.0 kqemu? ( app-emulation/kqemu ) app-text/texi2html" @@ -67,20 +68,23 @@ src_compile() { # Switch off hardened tech filter-flags -fpie -fstack-protector + set_target_list + myconf="--disable-gcc-check" if ! use sdl ; then myconf="$myconf --disable-gfx-check" fi - set_target_list -# --interp-prefix=${RUNTIME_PATH}/qemu-%M + ./configure \ --prefix=/usr \ --target-list="${TARGET_LIST}" \ --enable-slirp \ + --cc=$(tc-getCC) \ + --host-cc=$(tc-getCC) \ --kernel-path=${KV_DIR} \ + $(use_enable sdl)\ $(use_enable kqemu) \ ${myconf} \ - $(use_enable sdl)\ || die "could not configure" emake || die "make failed" |