summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch14
-rw-r--r--games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild4
2 files changed, 13 insertions, 5 deletions
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
index eedc9b24ce17..4d7547658bdc 100644
--- a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
@@ -1,10 +1,22 @@
+Allow user to specify AR. Derive ar from --host=.
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
-+AM_PROG_AR
++AC_CHECK_TOOL(AR, ar)
AC_ARG_WITH(xpm-lib,[ --with-xpm-lib Directory containing libXpm (may be autodetected)],xpm_lib=$withval)
AC_ARG_WITH(sound, [ --with-sound Type of sound to use (native or nas)],sound_type=$withval)
+--- a/libsprite/Makefile.in
++++ b/libsprite/Makefile.in
+@@ -8,7 +8,7 @@ VPATH = @srcdir@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+
+-AR = ar
++AR = @AR@
+ AR_FLAGS = rc
+ RANLIB = @RANLIB@
+
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index d644d2087dd3..45c550a058be 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
@@ -41,10 +41,6 @@ src_prepare() {
-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
-e 's:make ;:$(MAKE) ;:' \
Makefile.in || die "sed Makefile.in failed"
-
- sed -i \
- -e 's/AR = ar/AR = @AR@/' \
- libsprite/Makefile.in || die
}
src_install() {