diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-11-06 15:07:48 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-11-06 15:07:48 +0000 |
| commit | 22669b50806693f6c470a9d5d3c2ba75e7dd0fec (patch) | |
| tree | 859a52994fc836ad703f5820823dcc3475f67d4e /app-emulation/spectemu/files | |
| parent | Drop not needed inherits. (diff) | |
| download | gentoo-2-22669b50806693f6c470a9d5d3c2ba75e7dd0fec.tar.gz gentoo-2-22669b50806693f6c470a9d5d3c2ba75e7dd0fec.tar.bz2 gentoo-2-22669b50806693f6c470a9d5d3c2ba75e7dd0fec.zip | |
Fix parallel install wrt bug #255777. Fix automagic dependency on media-libs/svgalib. Migrate to EAPI 4.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'app-emulation/spectemu/files')
| -rw-r--r-- | app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch | 31 | ||||
| -rw-r--r-- | app-emulation/spectemu/files/spectemu-0.99.3-build.patch | 34 |
2 files changed, 65 insertions, 0 deletions
diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch new file mode 100644 index 000000000000..6e813d6373e5 --- /dev/null +++ b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch @@ -0,0 +1,31 @@ +--- configure.in ++++ configure.in +@@ -121,13 +121,22 @@ + dnl ----------------------------------------------------------- + dnl Check for SVGALIB + dnl ----------------------------------------------------------- +-AC_CHECK_LIB(vga, vga_setmode, no_vga="", no_vga=yes) +-if test "$no_vga" != yes; then +- progs="$progs vgaspect" +- vgalib=-lvga + +- LIBS="$vgalib $olibs" +- AC_CHECK_FUNC(vga_runinbackground_version, AC_DEFINE(RUN_IN_BACKGROUND)) ++svgalibs="" ++withsvga=no ++AC_ARG_WITH(svga, ++[ --with-svga Compile with svga library], ++[if test "$withval" = no; then withsvga=no; fi]) ++ ++if test "$withsvga" = yes; then ++ AC_CHECK_LIB(vga, vga_setmode, no_vga="", no_vga=yes) ++ if test "$no_vga" != yes; then ++ progs="$progs vgaspect" ++ vgalib=-lvga ++ ++ LIBS="$vgalib $olibs" ++ AC_CHECK_FUNC(vga_runinbackground_version, AC_DEFINE(RUN_IN_BACKGROUND)) ++ fi + fi + + LIBS="$olibs" diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-build.patch b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch new file mode 100644 index 000000000000..1c354a5fa933 --- /dev/null +++ b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch @@ -0,0 +1,34 @@ +--- Makefile.in ++++ Makefile.in +@@ -44,17 +44,19 @@ + ./mkinstalldirs $(i_bindir) $(i_mandir) + + install_prog: $(progs) ++ mkdir -p $(i_bindir) + if test -f xspect; then \ +- $(INSTALL_PROGRAM) -s -m 755 xspect $(i_bindir); fi ++ $(INSTALL_PROGRAM) -m 755 xspect $(i_bindir); fi + if test -f vgaspect; then \ +- $(INSTALL_PROGRAM) -s -m 4755 vgaspect $(i_bindir); fi ++ $(INSTALL_PROGRAM) -m 4755 vgaspect $(i_bindir); fi + + install_man: ++ mkdir -p $(i_mandir) + $(INSTALL_DATA) ./xspect.1 $(i_mandir) + $(INSTALL_DATA) ./tapeout.1 $(i_mandir) + (cd $(i_mandir); rm -f vgaspect.1; ln -s xspect.1 vgaspect.1) + +-install: installdirs install_prog install_man ++install: install_prog install_man + + z80_c_objs=z80.o z80optab.o z80_step.o spperif.o spect.o rom48.o \ + z80_op1.o z80_op2.o z80_op3.o z80_op4.o z80_op5.o z80_op6.o +@@ -88,7 +90,7 @@ + ./sp_to_s < i386emul.sp > i386emul.s + + i386emul.o: i386emul.s +- $(CC) -c $(CFLAGS) i386emul.s ++ $(CC) -c $(ASFLAGS) -Xassembler --noexecstack i386emul.s + + sp_to_s: sp_to_s.o + $(CC) -o sp_to_s $(LDFLAGS) sp_to_s.o |