| 1 |
commit: e4cdd2d3846ec2a1bf4f1281a56a179234410774 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 27 12:37:57 2020 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 27 12:37:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cdd2d3 |
| 7 |
|
| 8 |
media-libs/compface: fix configure |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/720850 |
| 11 |
Closes: https://bugs.gentoo.org/724730 |
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 13 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 14 |
|
| 15 |
media-libs/compface/files/compface-gentoo.patch | 29 +++++++++++++++++++++++-- |
| 16 |
1 file changed, 27 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/compface/files/compface-gentoo.patch b/media-libs/compface/files/compface-gentoo.patch |
| 19 |
index 2cfea742c98..d8754fd3d60 100644 |
| 20 |
--- a/media-libs/compface/files/compface-gentoo.patch |
| 21 |
+++ b/media-libs/compface/files/compface-gentoo.patch |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
--- a/Makefile.in |
| 24 |
+++ b/Makefile.in |
| 25 |
-@@ -1,10 +1,10 @@ |
| 26 |
+@@ -1,15 +1,16 @@ |
| 27 |
prefix = @prefix@ |
| 28 |
exec_prefix = @exec_prefix@ |
| 29 |
srcdir = @srcdir@ |
| 30 |
@@ -15,7 +15,22 @@ |
| 31 |
|
| 32 |
@SET_MAKE@ |
| 33 |
|
| 34 |
-@@ -77,10 +77,8 @@ |
| 35 |
+ RM = rm -f |
| 36 |
+ LN_S = @LN_S@ |
| 37 |
++AR = @AR@ |
| 38 |
+ RANLIB = @RANLIB@ |
| 39 |
+ INSTALL = @INSTALL@ |
| 40 |
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 41 |
+@@ -52,7 +53,7 @@ |
| 42 |
+ $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME) |
| 43 |
+ |
| 44 |
+ $(LIBNAME) : $(OBJECTS) |
| 45 |
+- ar rc $(LIBNAME) $(OBJECTS) |
| 46 |
++ $(AR) rc $(LIBNAME) $(OBJECTS) |
| 47 |
+ -$(RANLIB) $(LIBNAME) |
| 48 |
+ |
| 49 |
+ lint : |
| 50 |
+@@ -77,10 +78,8 @@ |
| 51 |
$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR) |
| 52 |
$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) |
| 53 |
-chmod 0755 $(EXECUTABLE) |
| 54 |
@@ -26,3 +41,13 @@ |
| 55 |
$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1 |
| 56 |
cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1 |
| 57 |
$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3 |
| 58 |
+--- a/configure.ac |
| 59 |
++++ b/configure.ac |
| 60 |
+@@ -8,6 +8,7 @@ |
| 61 |
+ AC_PROG_RANLIB |
| 62 |
+ AC_PROG_INSTALL |
| 63 |
+ AC_PROG_LN_S |
| 64 |
++AC_CHECK_TOOL(AR, ar) |
| 65 |
+ |
| 66 |
+ dnl Checks for libraries. |
| 67 |
+ |
Archives