diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2008-09-27 20:02:33 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2008-09-27 20:02:33 +0000 |
| commit | df2091e5d4f64a044c41a177fd47196221fca47f (patch) | |
| tree | 58bc110d9857b222e77b425b8b1279ec3f982fa3 /sys-apps | |
| parent | Tweak the PATH, ROOTHPATH and XDG_DATA_DIRS variables, thanks to Matthias Dah... (diff) | |
| download | gentoo-2-df2091e5d4f64a044c41a177fd47196221fca47f.tar.gz gentoo-2-df2091e5d4f64a044c41a177fd47196221fca47f.tar.bz2 gentoo-2-df2091e5d4f64a044c41a177fd47196221fca47f.zip | |
Fix concurrent build of v86d (bugs #238506, #238714).
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/v86d/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch | 43 | ||||
| -rw-r--r-- | sys-apps/v86d/v86d-0.1.8.ebuild | 10 |
3 files changed, 56 insertions, 3 deletions
diff --git a/sys-apps/v86d/ChangeLog b/sys-apps/v86d/ChangeLog index d539f50f8897..bf9f64cbd5e7 100644 --- a/sys-apps/v86d/ChangeLog +++ b/sys-apps/v86d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/v86d # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.23 2008/09/21 19:33:54 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.24 2008/09/27 20:02:32 spock Exp $ + + 27 Sep 2008; Michał Januszewski <spock@gentoo.org> + +files/v86d-0.1.8-concurrent-make.patch, v86d-0.1.8.ebuild: + Fix concurrent build of v86d (bugs #238506, #238714). *v86d-0.1.8 (21 Sep 2008) diff --git a/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch b/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch new file mode 100644 index 000000000000..1a969d67f7fc --- /dev/null +++ b/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch @@ -0,0 +1,43 @@ +diff -Naurp v86d-0.1.8-orig/Makefile v86d-0.1.8/Makefile +--- v86d-0.1.8-orig/Makefile 2008-09-27 21:52:56.000000000 +0200 ++++ v86d-0.1.8/Makefile 2008-09-27 21:53:50.000000000 +0200 +@@ -17,13 +17,13 @@ ifeq ($(call config_opt,CONFIG_X86EMU),t + CFLAGS += -Ilibs/x86emu + LDFLAGS += -Llibs/x86emu + LDLIBS += -lx86emu +- V86OBJS = v86_x86emu.o v86_mem.o ++ V86OBJS = v86_x86emu.o v86_mem.o v86_common.o + V86LIB = x86emu + else + CFLAGS += -Ilibs/lrmi-0.10 + LDFLAGS += -Llibs/lrmi-0.10 -static + LDLIBS += -llrmi +- V86OBJS = v86_lrmi.o ++ V86OBJS = v86_lrmi.o v86_common.o + V86LIB = lrmi + endif + +@@ -40,17 +40,17 @@ all: $(V86LIB) v86d $(DEBUG_BUILD) + %.o: %.c v86.h + $(CC) $(CFLAGS) -c -o $@ $< + +-v86d: v86.o v86_common.o $(V86OBJS) +- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@ ++v86d: $(V86OBJS) $(V86LIB) v86.o ++ $(CC) $(LDFLAGS) $(V86OBJS) v86.o $(LDLIBS) -o $@ + +-testvbe: testvbe.o v86_common.o $(V86OBJS) +- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@ ++testvbe: $(V86OBJS) $(V86LIB) testvbe.o ++ $(CC) $(LDFLAGS) $(V86OBJS) testvbe.o $(LDLIBS) -o $@ + + x86emu: +- make -w -C libs/x86emu ++ $(MAKE) -w -C libs/x86emu + + lrmi: +- make -e -w -C libs/lrmi-0.10 liblrmi.a ++ $(MAKE) -e -w -C libs/lrmi-0.10 liblrmi.a + + clean: + rm -rf *.o v86d testvbe diff --git a/sys-apps/v86d/v86d-0.1.8.ebuild b/sys-apps/v86d/v86d-0.1.8.ebuild index 55465fd78ccc..38e4f6d939d0 100644 --- a/sys-apps/v86d/v86d-0.1.8.ebuild +++ b/sys-apps/v86d/v86d-0.1.8.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.8.ebuild,v 1.1 2008/09/21 19:33:54 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.8.ebuild,v 1.2 2008/09/27 20:02:32 spock Exp $ -inherit linux-info multilib +inherit eutils linux-info multilib DESCRIPTION="A daemon to run x86 code in an emulated environment." HOMEPAGE="http://dev.gentoo.org/~spock/projects/uvesafb/" @@ -27,6 +27,12 @@ pkg_setup() { linux-info_pkg_setup } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-concurrent-make.patch" +} + src_compile() { ./configure --with-klibc $(use_with debug) $(use_with x86emu) make KDIR="${KV_DIR}" || die |