summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-08-04 12:56:23 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-08-04 12:59:45 +0100
commit28e0619ae605eb068871d93776fb915ff1cd44c6 (patch)
treebf11c6e40b450a7fe088882aa5fa84d38b58515d /games-arcade/xgalaga
parentsys-apps/pkgcore: Bump to 0.12.2 (diff)
downloadgentoo-28e0619ae605eb068871d93776fb915ff1cd44c6.tar.gz
gentoo-28e0619ae605eb068871d93776fb915ff1cd44c6.tar.bz2
gentoo-28e0619ae605eb068871d93776fb915ff1cd44c6.zip
games-arcade/xgalaga: fix AR support patch
AM_PROG_AR should be used only in build systems that use automake. For those that don't `AC_CHECK_TOOL` is usually good enough. Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/806382 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'games-arcade/xgalaga')
-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() {