commit: e4cdd2d3846ec2a1bf4f1281a56a179234410774 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Wed May 27 12:37:57 2020 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Wed May 27 12:37:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cdd2d3
media-libs/compface: fix configure Closes: https://bugs.gentoo.org/720850 Closes: https://bugs.gentoo.org/724730 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> media-libs/compface/files/compface-gentoo.patch | 29 +++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/media-libs/compface/files/compface-gentoo.patch b/media-libs/compface/files/compface-gentoo.patch index 2cfea742c98..d8754fd3d60 100644 --- a/media-libs/compface/files/compface-gentoo.patch +++ b/media-libs/compface/files/compface-gentoo.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -1,10 +1,10 @@ +@@ -1,15 +1,16 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ @@ -15,7 +15,22 @@ @SET_MAKE@ -@@ -77,10 +77,8 @@ + RM = rm -f + LN_S = @LN_S@ ++AR = @AR@ + RANLIB = @RANLIB@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -52,7 +53,7 @@ + $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME) + + $(LIBNAME) : $(OBJECTS) +- ar rc $(LIBNAME) $(OBJECTS) ++ $(AR) rc $(LIBNAME) $(OBJECTS) + -$(RANLIB) $(LIBNAME) + + lint : +@@ -77,10 +78,8 @@ $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR) $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) -chmod 0755 $(EXECUTABLE) @@ -26,3 +41,13 @@ $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1 cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1 $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3 +--- a/configure.ac ++++ b/configure.ac +@@ -8,6 +8,7 @@ + AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LN_S ++AC_CHECK_TOOL(AR, ar) + + dnl Checks for libraries. +
