[gentoo-commits] gentoo-x86 commit in app-emulation/spectemu/files: spectemu-0.99.3-build.patch spectemu-0.99.3-automagic.patch

[gentoo-commits] gentoo-x86 commit in app-emulation/spectemu/files: spectemu-0.99.3-build.patch spectemu-0.99.3-automagic.patch

[Michael Palimaka (kensington)]

kensington    12/11/06 15:07:48

  Added:                spectemu-0.99.3-build.patch
                        spectemu-0.99.3-automagic.patch
  Log:
  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)

Revision  Changes    Path
1.1                  app-emulation/spectemu/files/spectemu-0.99.3-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spectemu/files/spectemu-0.99.3-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spectemu/files/spectemu-0.99.3-build.patch?rev=1.1&content-type=text/plain

Index: spectemu-0.99.3-build.patch
===================================================================
--- 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



1.1                  app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch?rev=1.1&content-type=text/plain

Index: spectemu-0.99.3-automagic.patch
===================================================================
--- 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"